diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/loadbalancer.pp | 11 | ||||
| -rw-r--r-- | puppet/overcloud_compute.pp | 11 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 11 | ||||
| -rw-r--r-- | puppet/overcloud_object.pp | 10 | ||||
| -rw-r--r-- | puppet/overcloud_volume.pp | 11 | ||||
| -rw-r--r-- | puppet/ringbuilder.pp | 11 |
6 files changed, 65 insertions, 0 deletions
diff --git a/puppet/loadbalancer.pp b/puppet/loadbalancer.pp index 84598da6..88e6bdd4 100644 --- a/puppet/loadbalancer.pp +++ b/puppet/loadbalancer.pp @@ -13,6 +13,17 @@ # 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.') + } + } +} + class tripleo::loadbalancer ( $keystone_admin = false, $keystone_public = false, diff --git a/puppet/overcloud_compute.pp b/puppet/overcloud_compute.pp index 693a06b3..2ff31be2 100644 --- a/puppet/overcloud_compute.pp +++ b/puppet/overcloud_compute.pp @@ -13,6 +13,17 @@ # 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 ::ntp class { 'nova': diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index 6af54a5e..acfea686 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -13,6 +13,17 @@ # 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.') + } + } +} + if hiera('step') >= 1 { include ::ntp diff --git a/puppet/overcloud_object.pp b/puppet/overcloud_object.pp index d415c23a..c407afad 100644 --- a/puppet/overcloud_object.pp +++ b/puppet/overcloud_object.pp @@ -13,6 +13,16 @@ # 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 ::ntp include ::swift diff --git a/puppet/overcloud_volume.pp b/puppet/overcloud_volume.pp index 91566bb2..9351d708 100644 --- a/puppet/overcloud_volume.pp +++ b/puppet/overcloud_volume.pp @@ -13,6 +13,17 @@ # 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 ::ntp include ::cinder diff --git a/puppet/ringbuilder.pp b/puppet/ringbuilder.pp index 85f7eea5..531706d2 100644 --- a/puppet/ringbuilder.pp +++ b/puppet/ringbuilder.pp @@ -13,6 +13,17 @@ # 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.') + } + } +} + define add_devices( $swift_zones = '1' ){ |