diff options
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/nova.pp | 14 | ||||
| -rw-r--r-- | manifests/profile/base/nova/conductor.pp | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index abedf37..66f0d7d 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -25,8 +25,20 @@ class tripleo::profile::base::nova ( $step = hiera('step'), ) { - if $step >= 4 { + + if hiera('nova::use_ipv6', false) { + $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211') + } else { + $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211') + } + if $step >= 3 { include ::nova + # TODO(emilien): once we merge https://review.openstack.org/#/c/325983/ + # let's override the value this way. + warning('Overriding memcached_servers from puppet-tripleo until 325983 lands.') + Nova { + memcached_servers => $memcached_servers, + } include ::nova::config } } diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index 494bbc7..04c9d06 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -27,8 +27,8 @@ class tripleo::profile::base::nova::conductor ( $step = hiera('step'), ) { + include ::tripleo::profile::base::nova if $step >= 4 { - include ::tripleo::profile::base::nova include ::nova::conductor } |