aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/overcloud_controller.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-06 07:37:30 -0500
committerDan Prince <dprince@redhat.com>2015-02-06 08:39:05 -0500
commit4d470abc589c660cd55e4ced92de234fdf83d882 (patch)
tree18f6126badd870a0070c3e1431344b8fd1302fe0 /puppet/overcloud_controller.pp
parentf8a9c530e0694b956fb5819dd46e38380ecc58e2 (diff)
puppet: disable swift proxy and glance backend
We have an issue where swift.devices metadata isn't showing up on our controllers. This causes ringbuilding to fail meaning swift-proxy won't startup. This patch disables the swift-proxy and glance swift backend until we can figure out exactly what caused this change. Change-Id: I723a4b703d979d7475ac48f41c4c0ac91c306884 Partial-bug: 1418805
Diffstat (limited to 'puppet/overcloud_controller.pp')
-rw-r--r--puppet/overcloud_controller.pp30
1 files changed, 15 insertions, 15 deletions
diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp
index acfea686..5927e2f7 100644
--- a/puppet/overcloud_controller.pp
+++ b/puppet/overcloud_controller.pp
@@ -182,9 +182,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')],
@@ -243,18 +243,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':