Skip to content

Commit a5879f4

Browse files
committed
Rename variable 'manage_repos' to 'repos_ensure'
'manage_repos' doesn't describe the intended behaviour of the variable. We decided to rename it to 'repos_ensure'. This will break backward compatibility.
1 parent da24604 commit a5879f4

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

manifests/init.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$package_name = $rabbitmq::params::package_name,
2323
$package_provider = $rabbitmq::params::package_provider,
2424
$package_source = $rabbitmq::params::package_source,
25-
$manage_repos = $rabbitmq::params::manage_repos,
25+
$repos_ensure = $rabbitmq::params::repos_ensure,
2626
$plugin_dir = $rabbitmq::params::plugin_dir,
2727
$port = $rabbitmq::params::port,
2828
$tcp_keepalive = $rabbitmq::params::tcp_keepalive,
@@ -63,7 +63,7 @@
6363
validate_string($package_gpg_key)
6464
validate_string($package_name)
6565
validate_string($package_provider)
66-
validate_bool($manage_repos)
66+
validate_bool($repos_ensure)
6767
validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
6868
# Validate config parameters.
6969
validate_array($cluster_disk_nodes)

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
$management_port = '15672'
5353
$package_apt_pin = ''
5454
$package_gpg_key = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc'
55-
$manage_repos = true
55+
$repos_ensure = true
5656
$service_ensure = 'running'
5757
$service_manage = true
5858
#config

manifests/repo/apt.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
Class['rabbitmq::repo::apt'] -> Package<| title == 'rabbitmq-server' |>
1717

18-
$ensure_repo = $rabbitmq::manage_repos ? {
18+
$ensure_source = $rabbitmq::repos_ensure ? {
1919
false => 'absent',
2020
default => 'present',
2121
}
2222

2323
apt::source { 'rabbitmq':
24-
ensure => $ensure_repo,
24+
ensure => $ensure_source,
2525
location => $location,
2626
release => $release,
2727
repos => $repos,

manifests/repo/rhel.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Imports the gpg key if it doesn't already exist.
33
class rabbitmq::repo::rhel {
44

5-
if $rabbitmq::manage_repos {
5+
if $rabbitmq::repos_ensure {
66

77
$package_gpg_key = $rabbitmq::package_gpg_key
88

spec/classes/rabbitmq_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
end
2929

3030
context 'on Debian' do
31-
let(:params) {{ :manage_repos => false }}
31+
let(:params) {{ :repos_ensure => false }}
3232
let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
33-
it 'does ensure rabbitmq apt::source is absent when manage_repos is false' do
33+
it 'does ensure rabbitmq apt::source is absent when repos_ensure is false' do
3434
should contain_apt__source('rabbitmq').with(
3535
'ensure' => 'absent'
3636
)
@@ -45,9 +45,9 @@
4545
end
4646

4747
context 'on Redhat' do
48-
let(:params) {{ :manage_repos => false }}
48+
let(:params) {{ :repos_ensure => false }}
4949
let(:facts) {{ :osfamily => 'RedHat' }}
50-
it 'does not import repo public key when manage_repos is false' do
50+
it 'does not import repo public key when repos_ensure is false' do
5151
should_not contain_exec('rpm --import http://www.rabbitmq.com/rabbitmq-signing-key-public.asc')
5252
end
5353
end

0 commit comments

Comments
 (0)