commit 1b8979dc9fc8ce8d926008bdfa7ae21ce55bb950
author Dennis Dmitriev <ddmitriev@mirantis.com> Fri Oct 19 19:53:02 2018 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri Oct 19 17:05:58 2018 +0000
tree 8896993c7d31b683eff07ea4b745ced7818b7be4
parent 595d56c215dd21a316bec8314c1b722e31bcac97

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

tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml

diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
index 53f5dd0..cd95ec0 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
@@ -80,6 +80,7 @@
       reclass_storage_name: openstack_control_node01
       roles:
       - openstack_control_leader
+      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -91,6 +92,7 @@
       reclass_storage_name: openstack_control_node02
       roles:
       - openstack_control
+      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -102,6 +104,7 @@
       reclass_storage_name: openstack_control_node03
       roles:
       - openstack_control
+      - features_lvm_backend_control
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -191,7 +194,7 @@
       reclass_storage_name: openstack_compute_rack01
       roles:
       - openstack_compute
-      - features_lvm_backend
+      - features_lvm_backend_volume_vdb
       - linux_system_codename_xenial
       interfaces:
         ens3:

tcp_tests/templates/cookied-cicd-pike-dpdk/underlay.yaml

diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay.yaml
index 71c1914..d4e5d4d 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay.yaml
@@ -505,9 +505,6 @@
                   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