diff options
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 577f5052..66eb0c1b 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -26,7 +26,10 @@ if !str2bool(hiera('enable_package_install', 'false')) { if hiera('step') >= 1 { - include ::tripleo::loadbalancer + $controller_node_ips = split(downcase(hiera('controller_node_ips')), ',') + class { '::tripleo::loadbalancer' : + controller_hosts => $controller_node_ips, + } } @@ -116,7 +119,7 @@ if hiera('step') >= 2 { Class['rabbitmq'] -> Rabbitmq_user <| |> Class['rabbitmq'] -> Rabbitmq_user_permissions <| |> - $rabbit_nodes = split(downcase(hiera('rabbit_nodes', $::hostname)), ',') + $rabbit_nodes = split(downcase(hiera('rabbit_node_names', $::hostname)), ',') if count($rabbit_nodes) > 1 { $rabbit_cluster = true } @@ -290,7 +293,7 @@ if hiera('step') >= 3 { } } - $cinder_enabled_backends = concat(any2array($cinder_iscsi_backend), $cinder_rbd_backend) + $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend]) class { '::cinder::backends' : enabled_backends => $cinder_enabled_backends, } |