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

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 39d2a48..5b94a31 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -43,7 +43,7 @@ swift::proxy::account_autocreate: true
 glance::api::pipeline: 'keystone'
 glance::api::known_stores:
   - glance.store.filesystem.Store
-  - glance.store.swift.Store
+#  - glance.store.swift.Store
 glance::registry::pipeline: 'keystone'
 glance::registry::manage_service: true
 glance::backend::swift::swift_store_create_container_on_put: true

diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp
index acfea68..5927e2f 100644 (file)
--- 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':