From f98f2bdf4d2a0b78494c96627d8da47b92491ce1 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 12 Feb 2015 21:16:31 -0500 Subject: Revert "puppet: disable swift proxy and glance backend" This reverts commit 4d470abc589c660cd55e4ced92de234fdf83d882 where we disabled swift (and the glance swift backend) due to the fact that some of the Heat metadata wasn't showing up. Change-Id: Ib0c01be5844aa79d74b7de02ba3d0657db5047ba Closes-bug: 1418805 --- puppet/manifests/overcloud_controller.pp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'puppet/manifests') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 4801107b..b37f7235 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -184,9 +184,9 @@ 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']), - #} + class { 'glance::backend::swift': + swift_store_auth_address => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']), + } class { 'nova': rabbit_hosts => [hiera('controller_virtual_ip')], @@ -245,18 +245,18 @@ if hiera('step') >= 2 { # swift proxy include ::memcached - #include ::swift::proxy - #include ::swift::proxy::proxy_logging - #include ::swift::proxy::healthcheck - #include ::swift::proxy::cache - #include ::swift::proxy::keystone - #include ::swift::proxy::authtoken - #include ::swift::proxy::staticweb - #include ::swift::proxy::ceilometer - #include ::swift::proxy::ratelimit - #include ::swift::proxy::catch_errors - #include ::swift::proxy::tempurl - #include ::swift::proxy::formpost + include ::swift::proxy + include ::swift::proxy::proxy_logging + include ::swift::proxy::healthcheck + include ::swift::proxy::cache + include ::swift::proxy::keystone + include ::swift::proxy::authtoken + include ::swift::proxy::staticweb + include ::swift::proxy::ceilometer + include ::swift::proxy::ratelimit + include ::swift::proxy::catch_errors + include ::swift::proxy::tempurl + include ::swift::proxy::formpost # swift storage class {'swift::storage::all': -- cgit 1.2.3-korg