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
This commit is contained in:
parent
a38319dde5
commit
4f88464a62
@ -129,7 +129,7 @@ resources:
|
|||||||
raw_data: {get_file: hieradata/ceph.yaml}
|
raw_data: {get_file: hieradata/ceph.yaml}
|
||||||
mapped_data:
|
mapped_data:
|
||||||
ntp::servers: {get_input: ntp_servers}
|
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::cluster_network: {get_input: ceph_cluster_network}
|
||||||
ceph::profile::params::public_network: {get_input: ceph_public_network}
|
ceph::profile::params::public_network: {get_input: ceph_public_network}
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ resources:
|
|||||||
cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
|
cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
|
||||||
cinder::glance::glance_api_servers: {get_input: glance_api_servers}
|
cinder::glance::glance_api_servers: {get_input: glance_api_servers}
|
||||||
ntp::servers: {get_input: ntp_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_name: {get_input: snmpd_readonly_user_name}
|
||||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
||||||
|
|
||||||
|
@ -406,7 +406,7 @@ resources:
|
|||||||
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
||||||
admin_password: {get_input: admin_password}
|
admin_password: {get_input: admin_password}
|
||||||
ntp::servers: {get_input: ntp_servers}
|
ntp::servers: {get_input: ntp_servers}
|
||||||
enable_package_install: {get_input: enable_package_install}
|
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||||
|
|
||||||
NovaComputeDeployment:
|
NovaComputeDeployment:
|
||||||
type: OS::TripleO::SoftwareDeployment
|
type: OS::TripleO::SoftwareDeployment
|
||||||
|
@ -1074,7 +1074,7 @@ resources:
|
|||||||
public_virtual_interface: {get_input: public_virtual_interface}
|
public_virtual_interface: {get_input: public_virtual_interface}
|
||||||
tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
|
tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
|
||||||
tripleo::loadbalancer::public_virtual_interface: {get_input: public_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
|
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
|
||||||
ControllerExtraConfigPre:
|
ControllerExtraConfigPre:
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if !str2bool(hiera('enable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('enable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||||
|
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if !str2bool(hiera('enable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('enable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||||
|
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if !str2bool(hiera('enable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('enable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if hiera('step') >= 1 {
|
if hiera('step') >= 1 {
|
||||||
|
|
||||||
|
@ -18,16 +18,7 @@ Pcmk_resource <| |> {
|
|||||||
try_sleep => 3,
|
try_sleep => 3,
|
||||||
}
|
}
|
||||||
|
|
||||||
if !str2bool(hiera('enable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('enable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if $::hostname == downcase(hiera('bootstrap_nodeid')) {
|
if $::hostname == downcase(hiera('bootstrap_nodeid')) {
|
||||||
$pacemaker_master = true
|
$pacemaker_master = true
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if !str2bool(hiera('enable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('enable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||||
|
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if str2bool(hiera('disable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('disable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
create_resources(sysctl::value, hiera('sysctl_settings'), {})
|
||||||
|
|
||||||
|
@ -13,16 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
if str2bool(hiera('disable_package_install', 'false')) {
|
include tripleo::packages
|
||||||
case $::osfamily {
|
|
||||||
'RedHat': {
|
|
||||||
Package { provider => 'norpm' } # provided by tripleo-puppet
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
warning('disable_package_install option not supported.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
define add_devices(
|
define add_devices(
|
||||||
$swift_zones = '1'
|
$swift_zones = '1'
|
||||||
|
@ -150,7 +150,7 @@ resources:
|
|||||||
tripleo::ringbuilder::build_ring: True
|
tripleo::ringbuilder::build_ring: True
|
||||||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
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:
|
SwiftStorageHieraDeploy:
|
||||||
|
Loading…
Reference in New Issue
Block a user