summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-06-18 22:05:00 -0400
committerDan Prince <dprince@redhat.com>2015-07-20 16:22:52 -0400
commit4f88464a62e72a0a53b081edfe4e2a5f95f333b1 (patch)
tree8652cd01594e588a5c13e567b3b1ce385a647550 /puppet/manifests/overcloud_controller.pp
parenta38319dde5d1c2b83c6a35c397e17f8c5570d8f1 (diff)
Puppet: wire in tripleo::packages
This wires in use of a new puppet-tripleo class which encapsulates the logic to enable/disable package installation and upgrades. By using the new class we can remove the global Package provider declaration at the top of each module. Change-Id: I5c6e5fd8600031bd8fb6195649721607c560f9d5 Depends-on: Ie8fbc344149bc8c9977e127de77636903607617a
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp11
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index f17dc831..7bdbe519 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -13,16 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-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 hiera('step') >= 1 {