From 27e457e0dd21f767efedbc4d0430b4cbd974db0d Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 28 Apr 2016 11:37:32 -0500
Subject: 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
---
 puppet/extraconfig/pre_deploy/controller/cinder-dellsc.yaml | 2 +-
 puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml   | 2 +-
 puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'puppet/extraconfig/pre_deploy')

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}
-- 
cgit 1.2.3-korg