summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/controller-puppet.yaml2
-rw-r--r--puppet/manifests/overcloud_controller.pp4
2 files changed, 3 insertions, 3 deletions
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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index d4faf340..d6be9201 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -199,9 +199,7 @@ if hiera('step') >= 2 {
# TODO: notifications, scrubber, etc.
include ::glance::api
include ::glance::registry
- class { 'glance::backend::swift':
- swift_store_auth_address => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']),
- }
+ include ::glance::backend::swift
class { 'nova':
rabbit_hosts => [hiera('controller_virtual_ip')],