Move 'cinder' LVM volumes from ctl to cmp nodes
Based on changes:
https://gerrit.mcp.mirantis.com/#/c/28650/
https://review.gerrithub.io/#/c/Mirantis/environment-template/+/430087/
Only cookied models are changed, static deployments
left as is.
- move 'cinder' volumes to cmp nodes in underlay.yml
- remove 'cinder' volume from non-relevant nodes
- rename 'cinder' volumes on CEPH configs to correct labels
Change-Id: Iadfc153ecb80391a94efd872553c7a2e5219d426
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-environment.yaml
index ca8114b..65f4131 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-environment.yaml
@@ -20,6 +20,7 @@
- features_designate_pool_manager_database
- features_designate_pool_manager
- features_designate_pool_manager_keystone
+ - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
@@ -36,6 +37,7 @@
- openstack_message_queue
- features_designate_pool_manager_database
- features_designate_pool_manager
+ - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
@@ -52,6 +54,7 @@
- openstack_message_queue
- features_designate_pool_manager_database
- features_designate_pool_manager
+ - features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
@@ -115,6 +118,7 @@
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
+ - features_lvm_backend_volume_vdb
- linux_system_codename_xenial
interfaces:
ens3:
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
index 7225c6d..9572556 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
@@ -232,9 +232,6 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: mcp_ubuntu_1604_image
format: qcow2
- - name: cinder
- capacity: 50
- format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -273,9 +270,6 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: mcp_ubuntu_1604_image
format: qcow2
- - name: cinder
- capacity: 50
- format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -302,9 +296,6 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: mcp_ubuntu_1604_image
format: qcow2
- - name: cinder
- capacity: 50
- format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -409,9 +400,6 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: mcp_ubuntu_1604_image
format: qcow2
- - name: cinder
- capacity: 50
- format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -439,6 +427,9 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: cloudimage1604
format: qcow2
+ - name: cinder
+ capacity: 50
+ format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1
@@ -490,6 +481,9 @@
capacity: !os_env NODE_VOLUME_SIZE, 150
backing_store: cloudimage1604
format: qcow2
+ - name: cinder
+ capacity: 50
+ format: qcow2
- name: iso # Volume with name 'iso' will be used
# for store image with cloud-init metadata.
capacity: 1