Skip to content

Commit 310895e

Browse files
bastelfreakWilliam Yardley
bastelfreak
authored and
William Yardley
committed
implement Arch support
1 parent 425bb0f commit 310895e

File tree

13 files changed

+52
-83
lines changed

13 files changed

+52
-83
lines changed

‎manifests/config.pp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,11 @@
108108
}
109109
110110
# Get ranch (socket acceptor pool) availability,
111-
# use init class variable for that since version from the fact comes too late.
112-
$ranch = versioncmp($rabbitmq::version, '3.6') >= 0
111+
# Now that we have to rely on the fact, this may cause some chicken / egg
112+
# or idempotency problems
113+
if $::rabbitmq_version {
114+
$ranch = versioncmp($::rabbitmq_version, '3.6') >= 0
115+
}
113116
114117
file { '/etc/rabbitmq':
115118
ensure => directory,

‎manifests/init.pp‎

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@
1616
Stdlib::Absolutepath $env_config_path = $rabbitmq::params::env_config_path,
1717
Optional[String] $erlang_cookie = $rabbitmq::params::erlang_cookie,
1818
$interface = $rabbitmq::params::interface,
19-
Optional[Integer] $management_port = $rabbitmq::params::management_port,
19+
Integer $management_port = $rabbitmq::params::management_port,
2020
$management_ssl = $rabbitmq::params::management_ssl,
2121
Optional[String] $management_hostname = $rabbitmq::params::management_hostname,
2222
String $node_ip_address = $rabbitmq::params::node_ip_address,
2323
$package_apt_pin = $rabbitmq::params::package_apt_pin,
2424
String $package_ensure = $rabbitmq::params::package_ensure,
2525
String $package_gpg_key = $rabbitmq::params::package_gpg_key,
2626
String $package_name = $rabbitmq::params::package_name,
27-
Optional[String] $package_provider = $rabbitmq::params::package_provider,
2827
Optional[String] $package_source = undef,
2928
Boolean $repos_ensure = $rabbitmq::params::repos_ensure,
3029
$manage_repos = $rabbitmq::params::manage_repos,
31-
Stdlib::Absolutepath $plugin_dir = $rabbitmq::params::plugin_dir,
3230
$rabbitmq_user = $rabbitmq::params::rabbitmq_user,
3331
$rabbitmq_group = $rabbitmq::params::rabbitmq_group,
3432
$rabbitmq_home = $rabbitmq::params::rabbitmq_home,
@@ -48,10 +46,10 @@
4846
String $ssl_key = $rabbitmq::params::ssl_key,
4947
Optional[Integer] $ssl_depth = $rabbitmq::params::ssl_depth,
5048
Optional[String] $ssl_cert_password = $rabbitmq::params::ssl_cert_password,
51-
Optional[Integer] $ssl_port = $rabbitmq::params::ssl_port,
49+
Integer $ssl_port = $rabbitmq::params::ssl_port,
5250
$ssl_interface = $rabbitmq::params::ssl_interface,
53-
Optional[Integer] $ssl_management_port = $rabbitmq::params::ssl_management_port,
54-
Optional[Integer] $ssl_stomp_port = $rabbitmq::params::ssl_stomp_port,
51+
Integer $ssl_management_port = $rabbitmq::params::ssl_management_port,
52+
Integer $ssl_stomp_port = $rabbitmq::params::ssl_stomp_port,
5553
$ssl_verify = $rabbitmq::params::ssl_verify,
5654
$ssl_fail_if_no_peer_cert = $rabbitmq::params::ssl_fail_if_no_peer_cert,
5755
Optional[Array] $ssl_versions = $rabbitmq::params::ssl_versions,
@@ -65,12 +63,12 @@
6563
$ldap_port = $rabbitmq::params::ldap_port,
6664
Boolean $ldap_log = $rabbitmq::params::ldap_log,
6765
Hash $ldap_config_variables = $rabbitmq::params::ldap_config_variables,
68-
$stomp_port = $rabbitmq::params::stomp_port,
66+
Integer $stomp_port = $rabbitmq::params::stomp_port,
6967
Boolean $stomp_ssl_only = $rabbitmq::params::stomp_ssl_only,
70-
$version = $rabbitmq::params::version,
68+
Optional[String] $version = undef,
7169
Boolean $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change,
7270
$cluster_partition_handling = $rabbitmq::params::cluster_partition_handling,
73-
$file_limit = $rabbitmq::params::file_limit,
71+
Variant[Integer, String] $file_limit = $rabbitmq::params::file_limit,
7472
Hash $environment_variables = $rabbitmq::params::environment_variables,
7573
Hash $config_variables = $rabbitmq::params::config_variables,
7674
Hash $config_kernel_variables = $rabbitmq::params::config_kernel_variables,
@@ -86,34 +84,11 @@
8684

8785
# Validate install parameters.
8886
validate_re($package_apt_pin, '^(|\d+)$')
89-
validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
90-
validate_string($package_ensure)
91-
validate_string($package_gpg_key)
92-
validate_string($package_name)
93-
validate_string($package_provider)
94-
validate_bool($repos_ensure)
95-
validate_string($node_ip_address)
96-
if ! is_integer($port) {
97-
validate_re($port, ['\d+','UNSET'])
98-
}
99-
if ! is_integer($stomp_port) {
100-
validate_re($stomp_port, '\d+')
101-
}
10287

10388
# using sprintf for conversion to string, because "${file_limit}" doesn't
10489
# pass lint, despite being nicer
10590
validate_re(sprintf('%s', $file_limit),
10691
'^(\d+|-1|unlimited|infinity)$', '$file_limit must be a positive integer, \'-1\', \'unlimited\', or \'infinity\'.')
107-
if ! is_integer($ssl_port) {
108-
validate_re($ssl_port, '\d+')
109-
}
110-
if ! is_integer($ssl_management_port) {
111-
validate_re($ssl_management_port, '\d+')
112-
}
113-
if ! is_integer($ssl_stomp_port) {
114-
validate_re($ssl_stomp_port, '\d+')
115-
}
116-
validate_re($ldap_port, '\d+')
11792

11893
if $ssl_only and ! $ssl {
11994
fail('$ssl_only => true requires that $ssl => true')
@@ -138,7 +113,7 @@
138113
}
139114

140115
if $version != undef {
141-
warning('$version is now deprecated, and will not have any effect.')
116+
warning('$version is now deprecated, and will not have any effect. If you need to pin to a particular version, use $package_ensure')
142117
}
143118

144119
if $repos_ensure {

‎manifests/install.pp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# Class rabbitmq::install
2-
# Ensures the rabbitmq-server exists
2+
# Ensures that rabbitmq-server exists
33
class rabbitmq::install {
44

55
$package_ensure = $rabbitmq::package_ensure
66
$package_name = $rabbitmq::package_name
7-
$package_provider = $rabbitmq::package_provider
87

98
package { 'rabbitmq-server':
10-
ensure => $package_ensure,
11-
name => $package_name,
12-
provider => $package_provider,
13-
notify => Class['rabbitmq::service'],
9+
ensure => $package_ensure,
10+
name => $package_name,
11+
notify => Class['rabbitmq::service'],
1412
}
1513

1614
if $rabbitmq::environment_variables['MNESIA_BASE'] {

‎manifests/params.pp‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,18 @@
55
class rabbitmq::params {
66

77
case $::osfamily {
8+
'Archlinux': {
9+
$package_ensure = 'installed'
10+
$package_name = 'rabbitmq'
11+
$service_name = 'rabbitmq'
12+
$rabbitmq_user = 'rabbitmq'
13+
$rabbitmq_group = 'rabbitmq'
14+
$rabbitmq_home = '/var/lib/rabbitmq'
15+
}
816
'Debian': {
917
$package_ensure = 'installed'
1018
$package_name = 'rabbitmq-server'
1119
$service_name = 'rabbitmq-server'
12-
$package_provider = 'apt'
1320
$rabbitmq_user = 'rabbitmq'
1421
$rabbitmq_group = 'rabbitmq'
1522
$rabbitmq_home = '/var/lib/rabbitmq'
@@ -18,7 +25,6 @@
1825
$package_ensure = 'installed'
1926
$package_name = 'rabbitmq'
2027
$service_name = 'rabbitmq'
21-
$package_provider = 'openbsd'
2228
$rabbitmq_user = '_rabbitmq'
2329
$rabbitmq_group = '_rabbitmq'
2430
$rabbitmq_home = '/var/rabbitmq'
@@ -27,7 +33,6 @@
2733
$package_ensure = 'installed'
2834
$package_name = 'rabbitmq-server'
2935
$service_name = 'rabbitmq-server'
30-
$package_provider = 'yum'
3136
$rabbitmq_user = 'rabbitmq'
3237
$rabbitmq_group = 'rabbitmq'
3338
$rabbitmq_home = '/var/lib/rabbitmq'
@@ -36,7 +41,6 @@
3641
$package_ensure = 'installed'
3742
$package_name = 'rabbitmq-server'
3843
$service_name = 'rabbitmq-server'
39-
$package_provider = 'zypper'
4044
$rabbitmq_user = 'rabbitmq'
4145
$rabbitmq_group = 'rabbitmq'
4246
$rabbitmq_home = '/var/lib/rabbitmq'
@@ -49,7 +53,7 @@
4953
#install
5054
$admin_enable = true
5155
$management_hostname = undef
52-
$management_port = '15672'
56+
$management_port = 15672
5357
$management_ssl = true
5458
$package_apt_pin = ''
5559
$package_gpg_key = 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc'
@@ -74,7 +78,7 @@
7478
$erlang_cookie = undef
7579
$interface = 'UNSET'
7680
$node_ip_address = 'UNSET'
77-
$port = '5672'
81+
$port = 5672
7882
$tcp_keepalive = false
7983
$tcp_backlog = 128
8084
$tcp_sndbuf = undef
@@ -87,10 +91,10 @@
8791
$ssl_key = 'UNSET'
8892
$ssl_depth = undef
8993
$ssl_cert_password = undef
90-
$ssl_port = '5671'
94+
$ssl_port = 5671
9195
$ssl_interface = 'UNSET'
92-
$ssl_management_port = '15671'
93-
$ssl_stomp_port = '6164'
96+
$ssl_management_port = 15671
97+
$ssl_stomp_port = 6164
9498
$ssl_verify = 'verify_none'
9599
$ssl_fail_if_no_peer_cert = false
96100
$ssl_versions = undef
@@ -101,10 +105,10 @@
101105
$ldap_user_dn_pattern = 'cn=username,ou=People,dc=example,dc=com'
102106
$ldap_other_bind = 'anon'
103107
$ldap_use_ssl = false
104-
$ldap_port = '389'
108+
$ldap_port = 389
105109
$ldap_log = false
106110
$ldap_config_variables = {}
107-
$stomp_port = '6163'
111+
$stomp_port = 6163
108112
$stomp_ssl_only = false
109113
$wipe_db_on_cookie_change = false
110114
$cluster_partition_handling = 'ignore'

‎manifests/repo/rhel.pp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
gpgkey => $key_source,
1515
enabled => 1,
1616
}
17+
18+
# This may still be needed to prevent warnings
19+
exec { "rpm --import ${key_source}":
20+
path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
21+
unless => 'rpm -q gpg-pubkey-6026dfca-573adfde 2>/dev/null',
22+
}
1723
}

‎spec/acceptance/delete_guest_user_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
it 'should run successfully' do
66
pp = <<-EOS
77
class { 'rabbitmq':
8-
port => '5672',
8+
port => 5672,
99
delete_guest_user => true,
1010
}
1111
if $::osfamily == 'RedHat' {

‎spec/acceptance/parameter_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class { 'erlang': epel_enable => true }
1111
}
1212
class { '::rabbitmq':
1313
service_manage => true,
14-
port => '5672',
14+
port => 5672,
1515
delete_guest_user => true,
1616
admin_enable => true,
1717
}

‎spec/acceptance/policy_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class { 'erlang': epel_enable => true }
1212
}
1313
class { '::rabbitmq':
1414
service_manage => true,
15-
port => '5672',
15+
port => 5672,
1616
delete_guest_user => true,
1717
admin_enable => true,
1818
} ->

‎spec/acceptance/queue_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class { 'erlang': epel_enable => true }
1212
}
1313
class { '::rabbitmq':
1414
service_manage => true,
15-
port => '5672',
15+
port => 5672,
1616
delete_guest_user => true,
1717
admin_enable => true,
1818
} ->
@@ -87,8 +87,8 @@ class { 'erlang': epel_enable => true }
8787
}
8888
class { '::rabbitmq':
8989
service_manage => true,
90-
port => '5672',
91-
management_port => '11111',
90+
port => 5672,
91+
management_port => 11111,
9292
delete_guest_user => true,
9393
admin_enable => true,
9494
} ->

‎spec/acceptance/user_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class { 'erlang': epel_enable => true }
1212
}
1313
class { '::rabbitmq':
1414
service_manage => true,
15-
port => '5672',
15+
port => 5672,
1616
delete_guest_user => true,
1717
admin_enable => true,
1818
} ->

0 commit comments

Comments
 (0)