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
This commit is contained in:
parent
2f002bb061
commit
b1080692cd
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue