diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 14:32:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 14:32:32 +0000 |
| commit | 3ea42597cbe5136580955c5e13961f8b1d553d68 (patch) | |
| tree | 43b4b2f2b8c786d5ea996648935a0ce231e91b52 | |
| parent | 72fb6727951af2cf5b16e686b3a36f5f3a7c71c7 (diff) | |
| parent | b1080692cd70326153b9492877a88a51a9b42c57 (diff) | |
Merge "Import ::nova class from THT"
| -rw-r--r-- | manifests/profile/base/nova.pp | 14 | ||||
| -rw-r--r-- | manifests/profile/base/nova/conductor.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/nova.pp | 4 |
3 files changed, 15 insertions, 5 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 } diff --git a/manifests/profile/pacemaker/nova.pp b/manifests/profile/pacemaker/nova.pp index 09aed61..b6e6cba 100644 --- a/manifests/profile/pacemaker/nova.pp +++ b/manifests/profile/pacemaker/nova.pp @@ -35,8 +35,6 @@ class tripleo::profile::pacemaker::nova ( stop => '/bin/true', } - if $step >= 4 { - include ::tripleo::profile::base::nova - } + include ::tripleo::profile::base::nova } |