use xenial release for mon01 node
diff --git a/tcp_tests/templates/underlay/mk22-lab-basic.yaml b/tcp_tests/templates/underlay/mk22-lab-basic.yaml
index f23eade..f81b4ad 100644
--- a/tcp_tests/templates/underlay/mk22-lab-basic.yaml
+++ b/tcp_tests/templates/underlay/mk22-lab-basic.yaml
@@ -23,6 +23,7 @@
default_ctl03.mk22-lab-basic.local: +103
default_prx01.mk22-lab-basic.local: +121
default_cmp01.mk22-lab-basic.local: +105
+ default_mon01.mk22-lab-basic.local: +107
ip_ranges:
dhcp: [+100, -2]
@@ -38,6 +39,7 @@
default_ctl03.mk22-lab-basic.local: +103
default_prx01.mk22-lab-basic.local: +121
default_cmp01.mk22-lab-basic.local: +105
+ default_mon01.mk22-lab-basic.local: +107
ip_ranges:
dhcp: [+100, -2]
@@ -140,7 +142,7 @@
device: cdrom
bus: ide
cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
- cloudinit_user_data: !include mk22-lab-basic--user-data.yaml
+ cloudinit_user_data: !include mk22-lab-basic--user-data1404.yaml
interfaces: &interfaces
- label: eth0
@@ -178,7 +180,7 @@
device: cdrom
bus: ide
cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
- cloudinit_user_data: !include mk22-lab-basic--user-data.yaml
+ cloudinit_user_data: !include mk22-lab-basic--user-data1404.yaml
interfaces: *interfaces
network_config: *network_config
@@ -204,33 +206,7 @@
device: cdrom
bus: ide
cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
- cloudinit_user_data: !include mk22-lab-basic--user-data.yaml
-
- interfaces: *interfaces
- network_config: *network_config
-
- - name: prx01.mk22-lab-basic.local
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 1
- memory: !os_env SLAVE_NODE_MEMORY, 2048
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: eth0
- volumes:
- - name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
- backing_store: cloudimage1404
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
- cloudinit_user_data: !include mk22-lab-basic--user-data.yaml
+ cloudinit_user_data: !include mk22-lab-basic--user-data1404.yaml
interfaces: *interfaces
network_config: *network_config
@@ -256,7 +232,34 @@
device: cdrom
bus: ide
cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
- cloudinit_user_data: !include mk22-lab-basic--user-data.yaml
+ cloudinit_user_data: !include mk22-lab-basic--user-data1404.yaml
interfaces: *interfaces
network_config: *network_config
+
+ - name: mon01.mk22-lab-basic.local
+ role: salt_minion
+ params:
+ vcpu: !os_env SLAVE_NODE_CPU, 1
+ memory: !os_env SLAVE_NODE_MEMORY, 2048
+ boot:
+ - hd
+ cloud_init_volume_name: iso
+ cloud_init_iface_up: eth0
+ volumes:
+ - name: system
+ capacity: !os_env NODE_VOLUME_SIZE, 150
+ backing_store: cloudimage1604
+ format: qcow2
+ - name: iso # Volume with name 'iso' will be used
+ # for store image with cloud-init metadata.
+ capacity: 1
+ format: raw
+ device: cdrom
+ bus: ide
+ cloudinit_meta_data: !include mk22-lab-basic--meta-data.yaml
+ cloudinit_user_data: !include mk22-lab-basic--user-data1604.yaml
+
+ interfaces: *interfaces
+ network_config: *network_config
+