diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-06 11:18:48 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-06-09 22:03:40 -0400 |
| commit | b1080692cd70326153b9492877a88a51a9b42c57 (patch) | |
| tree | b68db0f9af974c580e83fbafd23d796ef5926888 /manifests/profile | |
| parent | 2f002bb0615a4ab8aa4954796a68936b0a4bdecb (diff) | |
Import ::nova class from THT
Import ::nova class with memcached parameter computed from Hiera, that
was previously in THT, now in nova-base role.
Use step 3 for ::nova since we need it for database resources.
Also make sure nova base profile is included for conductor role and any
nova pacemaker role.
Change-Id: I45244861082edae616f2b82334e7678cefa97bc7
Implements: blueprint refactor-puppet-manifests
Diffstat (limited to 'manifests/profile')
| -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 } |