openstack/puppet-openstack-integration
Code Issues Proposed changes

rabbitmq: use $::package_provider fact

Browse Source 
Switch package_provider to use $::package_provider fact present in
puppetlabs-stdlib.

It will avoid any collision later.

Change-Id: I2df1bff1b911c22eed8a2f6b9c0ab38edda43156
This commit is contained in:
Emilien Macchi 2016-04-12 17:24:05 -04:00
parent 354c7619e3
commit e22fe0ed9b
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/rabbitmq.pp
View File

@ -3,18 +3,6 @@ class openstack_integration::rabbitmq {
include ::openstack_integration::params include ::openstack_integration::params
include ::openstack_integration::config include ::openstack_integration::config
case $::osfamily {
'Debian': {
$package_provider = 'apt'
}
'RedHat': {
$package_provider = 'yum'
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
file { '/etc/rabbitmq/ssl/private': file { '/etc/rabbitmq/ssl/private':
ensure => directory, ensure => directory,
@ -29,8 +17,8 @@ class openstack_integration::rabbitmq {
notify => Service['rabbitmq-server'], notify => Service['rabbitmq-server'],
} }
class { '::rabbitmq': class { '::rabbitmq':
package_provider => $::package_provider,
delete_guest_user => true, delete_guest_user => true,
package_provider => $package_provider,
ssl => true, ssl => true,
ssl_only => true, ssl_only => true,
ssl_cacert => $::openstack_integration::params::ca_bundle_cert_path, ssl_cacert => $::openstack_integration::params::ca_bundle_cert_path,
@ -40,8 +28,8 @@ class openstack_integration::rabbitmq {
} }
} else { } else {
class { '::rabbitmq': class { '::rabbitmq':
package_provider => $::package_provider,
delete_guest_user => true, delete_guest_user => true,
package_provider => $package_provider,
environment_variables => $::openstack_integration::config::rabbit_env, environment_variables => $::openstack_integration::config::rabbit_env,
} }
} }