diff options
author | Giulio Fidente <gfidente@redhat.com> | 2015-07-16 20:51:23 +0200 |
---|---|---|
committer | Giulio Fidente <gfidente@redhat.com> | 2015-07-22 01:11:41 +0200 |
commit | 0378fbe3ed037578f2a991e2f1322ccaf41676fb (patch) | |
tree | 852ccf848688c540360a2576256549b76d85a4cf /puppet/manifests | |
parent | 7fc1f4df89019d2771d5d055a99d02ad3373e6b9 (diff) |
Provide list of memcached servers to Nova
Memcached is used by novnc to share the auth tokens.
Change-Id: I18415b6ae38b46e3c92e4ce84b858a014ef8398b
Diffstat (limited to 'puppet/manifests')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 | ||||
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 4 |
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 24a2f734..0cdd31d5 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -556,7 +556,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, |