aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2015-03-06 15:10:47 -0500
committerDan Prince <dprince@redhat.com>2015-03-06 22:11:55 -0500
commit83a9562b377623279aae170f86c024c2c27e341f (patch)
tree07b5bbf0a2ded847cd632320ecd3c128d6c04270 /puppet/manifests
parent67fc92c5e4202362bd40db620ad5d4649f79f8dd (diff)
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 <dprince@redhat.com>
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp4
1 files changed, 1 insertions, 3 deletions
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')],