diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-21 10:52:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-21 10:52:53 +0000 |
commit | 7fc1f4df89019d2771d5d055a99d02ad3373e6b9 (patch) | |
tree | e3819e2b45fd16e02c9c3026abcac35cb5587236 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | 9c8364184c0c79e4dc94533901cbab65aff0d399 (diff) | |
parent | 4f88464a62e72a0a53b081edfe4e2a5f95f333b1 (diff) |
Merge "Puppet: wire in tripleo::packages"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index d85ef55a..24a2f734 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -18,16 +18,7 @@ Pcmk_resource <| |> { try_sleep => 3, } -if !str2bool(hiera('enable_package_install', 'false')) { - case $::osfamily { - 'RedHat': { - Package { provider => 'norpm' } # provided by tripleo-puppet - } - default: { - warning('enable_package_install option not supported.') - } - } -} +include tripleo::packages if $::hostname == downcase(hiera('bootstrap_nodeid')) { $pacemaker_master = true |