lava/ansible: Switch VM nodes to ci-host-amd64-2d

Change-Id: Ia5b72defd7ac5963a6731714f16d3412140a3041

diff --git a/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml b/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
index 585590a0d9c95485fb0e76aad82608f3148211a6..542ac22dda2c2bd712cd5c2b2cc3eb7240b482fb 100644 (file)
--- a/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
+++ b/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
@@ -1,4 +1,7 @@
 ---
+extra_root_ssh_authorized_keys:
+  # yamllint disable-line rule:line-length
+  - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmmI2pn+ncFKm/fOS5+RskBGnhbMd0p399ZWEKLUQ+Q lava-master-03'
 lxd_cluster_ip: 172.18.0.197
 lxd_cluster:
   enabled: true

diff --git a/automation/ansible/vars/ci-instances.yml b/automation/ansible/vars/ci-instances.yml
index 7ee7f48fe9b6cd61665898e0397e9e06ad2b7059..9db508b0f642268701717faf7dc78cc019799ca5 100644 (file)
--- a/automation/ansible/vars/ci-instances.yml
+++ b/automation/ansible/vars/ci-instances.yml
@@ -1040,3 +1040,39 @@ containers:
       host: 'ci-host-amd64-1c.internal.efficios.com'
     meta:
       address: 172.18.17.10
+  # VMs for running tests using lava
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-01'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-01.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-02'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-02.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-03'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-03.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-04'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-04.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-05'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-05.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'

diff --git a/lava/devices/lava-node-amd64-01.jinja2 b/lava/devices/lava-node-amd64-01.jinja2
index a89c498b50c86f9ee94c3157063955f5c3e289db..8fe0206de27f699f080021349549752ae4518649 100644 (file)
--- a/lava/devices/lava-node-amd64-01.jinja2
+++ b/lava/devices/lava-node-amd64-01.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-01' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-01' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}

diff --git a/lava/devices/lava-node-amd64-02.jinja2 b/lava/devices/lava-node-amd64-02.jinja2
index 8c1f78a4cbf7696f382e7c55cb358aef7e32cc7f..50604b36298348d28d79c4d36f073c87c61cbc59 100644 (file)
--- a/lava/devices/lava-node-amd64-02.jinja2
+++ b/lava/devices/lava-node-amd64-02.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-02' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-02' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}

diff --git a/lava/devices/lava-node-amd64-03.jinja2 b/lava/devices/lava-node-amd64-03.jinja2
index e24d39c9c6ec21bdffc7256602b6e155956f482a..9be0b074f66977bdfd8cbaed6e466a1af750662e 100644 (file)
--- a/lava/devices/lava-node-amd64-03.jinja2
+++ b/lava/devices/lava-node-amd64-03.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-03' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-03' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}

diff --git a/lava/devices/lava-node-amd64-04.jinja2 b/lava/devices/lava-node-amd64-04.jinja2
index 1de006e8958ff96fd38050632bbb2b4a11460871..cf0bc4601f3c4ce64b779bf56958193101a8be18 100644 (file)
--- a/lava/devices/lava-node-amd64-04.jinja2
+++ b/lava/devices/lava-node-amd64-04.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-04' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-04' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}

diff --git a/lava/devices/lava-node-amd64-05.jinja2 b/lava/devices/lava-node-amd64-05.jinja2
index f056d8037bd349da45225fecbbec507e316eef35..0a305b9f0d0f39fa1879d1f970b5fc0b7b6c4d79 100644 (file)
--- a/lava/devices/lava-node-amd64-05.jinja2
+++ b/lava/devices/lava-node-amd64-05.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-05' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-05' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}