diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-01 19:26:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-01 19:26:14 +0000 |
| commit | 9bf344f4786e343f5670addf3819c87cf2bc484d (patch) | |
| tree | 60368a87f8713bb40ebd1577abdcc992dca35263 /puppet/manifests | |
| parent | bac7f95043b85deabba27833b489a0162703c9b5 (diff) | |
| parent | 5009cc64322e9fb5723799eb9fbd79076a2dc5da (diff) | |
Merge "puppet: wire in osfamily hieradata support"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index e71adece..b08769ad 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -109,12 +109,6 @@ if hiera('step') >= 2 { allowed_hosts => $allowed_hosts, } - if $::osfamily == 'RedHat' { - $rabbit_provider = 'yum' - } else { - $rabbit_provider = undef - } - Class['rabbitmq'] -> Rabbitmq_vhost <| |> Class['rabbitmq'] -> Rabbitmq_user <| |> Class['rabbitmq'] -> Rabbitmq_user_permissions <| |> @@ -127,7 +121,6 @@ if hiera('step') >= 2 { $rabbit_cluster = false } class { 'rabbitmq': - package_provider => $rabbit_provider, config_cluster => $rabbit_cluster, cluster_nodes => $rabbit_nodes, node_ip_address => hiera('controller_host'), |