Update all cicd models
Add runtest_cfg role to baremetal envs
Add manila_enabled and barbican_enabled params
to all context
Change-Id: I37b7725291e04083ed0bf1b7a6a08ac45aac5dfb
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
index 4d3ffd6..e1b92fb 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
@@ -4,9 +4,10 @@
roles:
- infra_config
- linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_static_mgm
+ - features_runtest_cfg
+ interfaces:
+ ens3:
+ role: single_static_mgm
ens4:
role: single_static_ctl
# Physical nodes
@@ -18,11 +19,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
kvm02.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node02
@@ -31,11 +32,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
kvm03.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node03
@@ -44,11 +45,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
osd<<count>>:
reclass_storage_name: ceph_osd_rack01
@@ -57,10 +58,10 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: single_vlan_ctl
-# role: bond0_ab_vlan_ceph_storage_backend
+# role: bond0_ab_vlan_ceph_storage_backend
cmp<<count>>:
reclass_storage_name: openstack_compute_rack01
@@ -68,9 +69,9 @@
- openstack_compute
- linux_system_codename_xenial
interfaces:
- #one1: unused
+ #one1: unused
one2:
- role: single_dhcp
+ role: single_dhcp
ten1:
role: bond0_ab_contrail
ten2: