summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-23 09:53:23 +0000
committerGerrit Code Review <review@openstack.org>2015-07-23 09:53:23 +0000
commit9b5e99a56a8c2d7cbfc7e1c1e8b86dd894c55efa (patch)
tree2d10ee0eb2b5fb81addb5c12561efe9a81bbfbd6 /puppet/manifests
parent0efe4c7ebee20db5f232f590c6ebc3d40e546c20 (diff)
parent0378fbe3ed037578f2a991e2f1322ccaf41676fb (diff)
Merge "Provide list of memcached servers to Nova"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp4
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
2 files changed, 6 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index c9ff86c6..03f47eca 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -244,7 +244,9 @@ if hiera('step') >= 3 {
include ::glance::registry
include join(['::glance::backend::', $glance_backend])
- include ::nova
+ class { '::nova' :
+ memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
+ }
include ::nova::api
include ::nova::cert
include ::nova::conductor
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 480ac550..8f6d4c60 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -563,7 +563,9 @@ if hiera('step') >= 3 {
}
include join(['::glance::backend::', $glance_backend])
- include ::nova
+ class { '::nova' :
+ memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
+ }
class { '::nova::api' :
sync_db => $sync_db,