diff options
Diffstat (limited to 'manifests/profile/base/nova.pp')
| -rw-r--r-- | manifests/profile/base/nova.pp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 877184d..b43b8e8 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -22,28 +22,28 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # -# [*step*] -# (Optional) The current step of the deployment -# Defaults to hiera('step') +# [*libvirt_enabled*] +# (Optional) Whether or not Libvirt is enabled. +# Defaults to false # # [*manage_migration*] # (Optional) Whether or not manage Nova Live migration # Defaults to false # -# [*libvirt_enabled*] -# (Optional) Whether or not Libvirt is enabled. -# Defaults to false -# # [*nova_compute_enabled*] # (Optional) Whether or not nova-compute is enabled. # Defaults to false # +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), - $manage_migration = false, $libvirt_enabled = false, + $manage_migration = false, $nova_compute_enabled = false, + $step = hiera('step'), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -52,9 +52,9 @@ class tripleo::profile::base::nova ( } if hiera('nova::use_ipv6', false) { - $memcache_servers = suffix(hiera('memcache_node_ips_v6'), ':11211') + $memcache_servers = suffix(hiera('memcached_node_ips_v6'), ':11211') } else { - $memcache_servers = suffix(hiera('memcache_node_ips'), ':11211') + $memcache_servers = suffix(hiera('memcached_node_ips'), ':11211') } if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { |