openstack/tripleo-heat-templates
Code Issues Proposed changes

Puppet: wire in tripleo::packages

Browse Source 
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
This commit is contained in:
Dan Prince 2015-06-18 22:05:00 -04:00
parent a38319dde5
commit 4f88464a62
12 changed files with 12 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/ceph-storage-puppet.yaml
View File

@ -129,7 +129,7 @@ resources:
raw_data: {get_file: hieradata/ceph.yaml}
mapped_data:
ntp::servers: {get_input: ntp_servers}
enable_package_install: {get_input: enable_package_install}
tripleo::packages::enable_install: {get_input: enable_package_install}
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
ceph::profile::params::public_network: {get_input: ceph_public_network}

2
puppet/cinder-storage-puppet.yaml
View File

@ -258,7 +258,7 @@ resources:
cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
cinder::glance::glance_api_servers: {get_input: glance_api_servers}
ntp::servers: {get_input: ntp_servers}
enable_package_install: {get_input: enable_package_install}
tripleo::packages::enable_install: {get_input: enable_package_install}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}

2
puppet/compute-puppet.yaml
View File

@ -406,7 +406,7 @@ resources:
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
admin_password: {get_input: admin_password}
ntp::servers: {get_input: ntp_servers}
enable_package_install: {get_input: enable_package_install}
tripleo::packages::enable_install: {get_input: enable_package_install}
NovaComputeDeployment:
type: OS::TripleO::SoftwareDeployment

2
puppet/controller-puppet.yaml
View File

@ -1074,7 +1074,7 @@ resources:
public_virtual_interface: {get_input: public_virtual_interface}
tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}
enable_package_install: {get_input: enable_package_install}
tripleo::packages::enable_install: {get_input: enable_package_install}
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
ControllerExtraConfigPre:

11
puppet/manifests/overcloud_cephstorage.pp
View File

@ -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
create_resources(sysctl::value, hiera('sysctl_settings'), {})

11
puppet/manifests/overcloud_compute.pp
View File

@ -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
create_resources(sysctl::value, hiera('sysctl_settings'), {})

11
puppet/manifests/overcloud_controller.pp
View File

@ -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 {

11
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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

11
puppet/manifests/overcloud_object.pp
View File

@ -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
create_resources(sysctl::value, hiera('sysctl_settings'), {})

11
puppet/manifests/overcloud_volume.pp
View File

@ -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
create_resources(sysctl::value, hiera('sysctl_settings'), {})

11
puppet/manifests/ringbuilder.pp
View File

@ -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'

2
puppet/swift-storage-puppet.yaml
View File

@ -150,7 +150,7 @@ resources:
tripleo::ringbuilder::build_ring: True
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
enable_package_install: {get_input: enable_package_install}
tripleo::packages::enable_install: {get_input: enable_package_install}
SwiftStorageHieraDeploy: