From 83a9562b377623279aae170f86c024c2c27e341f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 6 Mar 2015 15:10:47 -0500 Subject: Puppet: define swift_store_auth_address in hiera This patch updates the glance::backend::swift implementation to use only hiera variables instead of a mix of hiera, and inline class variables. Nothing was functionally wrong with the previous approach but now that we can compose more freely using the SoftwareDeployment defining all the variables in Hiera makes sense and is cleaner. Change-Id: I6d319841488d2ed94e088a5ac21e41dcd964ed1a Co-Authored-By: Dan Prince --- puppet/controller-puppet.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/controller-puppet.yaml') diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index fe03fbf6..5f9bd8b5 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -449,6 +449,7 @@ resources: glance_port: {get_param: GlancePort} glance_protocol: {get_param: GlanceProtocol} glance_password: {get_param: GlancePassword} + glance_swift_store_auth_address: {list_join: ['', ['http://', {get_param: VirtualIP} , ':5000/v2.0']]} glance_notifier_strategy: {get_param: GlanceNotifierStrategy} glance_log_file: {get_param: GlanceLogFile} glance_dsn: @@ -615,6 +616,7 @@ resources: glance::registry::database_connection: {get_input: glance_dsn} glance::registry::bind_host: {get_input: controller_host} glance::registry::auth_host: {get_input: controller_virtual_ip} + glance::backend::swift::swift_store_auth_address: {get_input: glance_swift_store_auth_address} glance::backend::swift::swift_store_user: service:glance glance::backend::swift::swift_store_key: {get_input: glance_password} # Heat -- cgit 1.2.3-korg