summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-20 11:04:34 +0000
committerGerrit Code Review <review@openstack.org>2016-05-20 11:04:34 +0000
commite6683792ccf1a546b0a5025c1a8140d7e6becd9a (patch)
tree31e94412475bbae0b64a50e20ae330ce06cbde18 /puppet/manifests/overcloud_controller.pp
parent172ded7a402e1ac28cc9601ab9faf815df98742e (diff)
parent565f0c509d2650ee283ad72bc5b280aca4e07144 (diff)
Merge "Adds memcached as a composable service"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 833a3e01..9a2249d7 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -452,7 +452,6 @@ if hiera('step') >= 4 {
}
# swift proxy
- include ::memcached
include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck