Switch Cinder Api/Scheduler/Volume to composable roles

Uses a shared cinder-base resource to do the database
and messaging configuration for all three services.

Depends-On: I3c6d5226eed5f0f852b0ad9476c7cd9a959fda69
Change-Id: I47c5fd190efca5f02e73fd22aba6cda573daf5cc

4 files changed, 5 insertions, 5 deletions

diff --git a/puppet/extraconfig/ceph/ceph-external-config.yaml b/puppet/extraconfig/ceph/ceph-external-config.yaml
index 308c609a..7d4dc15b 100644
--- a/puppet/extraconfig/ceph/ceph-external-config.yaml
+++ b/puppet/extraconfig/ceph/ceph-external-config.yaml
@@ -83,7 +83,7 @@ resources:
                       GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
                 ceph::profile::params::ms_bind_ipv6: {get_param: CephIPv6}
                 nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName}
-                cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
+                tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
                 glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
                 gnocchi::storage::ceph::ceph_pool: {get_param: GnocchiRbdPoolName}
                 gnocchi::storage::ceph::ceph_username: {get_param: CephClientUserName}
@@ -101,7 +101,7 @@ resources:
                     - 'client'
                     - {get_param: CephClientUserName}
                     - 'keyring'
-                ceph_client_user_name: {get_param: CephClientUserName}
+                tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
                 ceph_pools:
                   - {get_param: CinderRbdPoolName}
                   - {get_param: NovaRbdPoolName}
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-dellsc.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-dellsc.yaml
index 9b6981bb..9423208e 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-dellsc.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-dellsc.yaml
@@ -51,7 +51,7 @@ resources:
           datafiles:
             cinder_dellsc_data:
               mapped_data:
-                cinder_enable_dellsc_backend: {get_input: EnableDellScBackend}
+                tripleo::profile::base::cinder::volume::cinder_enable_dellsc_backend: {get_input: EnableDellScBackend}
                 cinder::backend::dellsc_iscsi::volume_backend_name: {get_input: DellScBackendName}
                 cinder::backend::dellsc_iscsi::san_ip: {get_input: DellScSanIp}
                 cinder::backend::dellsc_iscsi::san_login: {get_input: DellScSanLogin}
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml
index 36db334e..c7af6f22 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml
@@ -50,7 +50,7 @@ resources:
           datafiles:
             cinder_eqlx_data:
               mapped_data:
-                cinder_enable_eqlx_backend: {get_input: EnableEqlxBackend}
+                tripleo::profile::base::cinder::volume::cinder_enable_eqlx_backend: {get_input: EnableEqlxBackend}
                 cinder::backend::eqlx::volume_backend_name: {get_input: EqlxBackendName}
                 cinder::backend::eqlx::san_ip: {get_input: EqlxSanIp}
                 cinder::backend::eqlx::san_login: {get_input: EqlxSanLogin}
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
index ab442f2b..6ff90881 100644
--- a/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
@@ -87,7 +87,7 @@ resources:
           datafiles:
             cinder_netapp_data:
               mapped_data:
-                cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
+                tripleo::profile::base::cinder::volume::cinder_enable_netapp_backend: {get_input: EnableNetappBackend}
                 cinder::backend::netapp::title: {get_input: NetappBackendName}
                 cinder::backend::netapp::netapp_login: {get_input: NetappLogin}
                 cinder::backend::netapp::netapp_password: {get_input: NetappPassword}