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/ringbuilder.pp | |
| parent | 9c8364184c0c79e4dc94533901cbab65aff0d399 (diff) | |
| parent | 4f88464a62e72a0a53b081edfe4e2a5f95f333b1 (diff) | |
Merge "Puppet: wire in tripleo::packages"
Diffstat (limited to 'puppet/manifests/ringbuilder.pp')
| -rw-r--r-- | puppet/manifests/ringbuilder.pp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp index 531706d2..14fbafdd 100644 --- a/puppet/manifests/ringbuilder.pp +++ b/puppet/manifests/ringbuilder.pp @@ -13,16 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -if str2bool(hiera('disable_package_install', 'false')) { - case $::osfamily { - 'RedHat': { - Package { provider => 'norpm' } # provided by tripleo-puppet - } - default: { - warning('disable_package_install option not supported.') - } - } -} +include tripleo::packages define add_devices( $swift_zones = '1' |