Change cinder-volumes-pool maas creating for e7
Related_prod: PROD-36975
Change-Id: Ie8a9609298ca56ef0086cb02d4565689a287aaf8
Change-Id: I7b52ff6b4fb4b87426a1bc6440db4e70c648e7fe
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 2a68796..d38c6ce 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -185,13 +185,6 @@
mount: '/'
sdb:
type: physical
- cinder-vg:
- type: lvm
- devices:
- - sdb
- volume:
- cinder-vg-pool:
- size: 800G
power_parameters:
power_address: "5.43.227.11"
power_pass: ==IPMI_PASS==
@@ -238,13 +231,6 @@
size: 800G
sdb:
type: physical
- cinder-vg:
- type: lvm
- devices:
- - sdb
- volume:
- cinder-vg-pool:
- size: 800G
power_parameters:
power_address: "5.43.227.19"
power_pass: ==IPMI_PASS==
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
index 4e7069c..2b15d2a 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
@@ -81,8 +81,7 @@
skip_fail: false
{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
-{{ SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM() }}
-{{ SHARED_WORKAROUNDS.CLEAR_CEPH_OSD_DRIVES() }}
+{{SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM()}}
- description: Add route cfg01 to kvm01, remove rp_filter (CIS-3-2-7)
cmd: |
@@ -94,3 +93,11 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
+
+- description: Create cinder-volumes-pool on cmp for e7. RelatedProd:PROD-36975
+ cmd: |
+ set -x;
+ salt -C 'I@cinder:volume and cmp*' cmd.run 'vgcreate cinder-vg /dev/sdb';
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: { count: 1, delay: 1 }
+ skip_fail: false