Skip to content

Commit c1aa1dc

Browse files
author
Carl Flippin
committed
Merge pull request voxpupuli#1 from carlf/add_mqtt
First pass at adding mqtt support
2 parents f04789e + d527d25 commit c1aa1dc

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

manifests/init.pp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
$cluster_nodes = $rabbitmq::params::cluster_nodes,
66
$config = $rabbitmq::params::config,
77
$config_cluster = $rabbitmq::params::config_cluster,
8+
$config_mqtt = $rabbitmq::params::config_mqtt,
89
$config_path = $rabbitmq::params::config_path,
910
$config_stomp = $rabbitmq::params::config_stomp,
1011
$default_user = $rabbitmq::params::default_user,
@@ -24,6 +25,8 @@
2425
$package_source = undef,
2526
$repos_ensure = $rabbitmq::params::repos_ensure,
2627
$manage_repos = $rabbitmq::params::manage_repos,
28+
$mqtt_ensure = $rabbitmq::params::mqtt_ensure,
29+
$mqtt_port = $rabbitmq::params::mqtt_port,
2730
$plugin_dir = $rabbitmq::params::plugin_dir,
2831
$rabbitmq_user = $rabbitmq::params::rabbitmq_user,
2932
$rabbitmq_group = $rabbitmq::params::rabbitmq_group,
@@ -41,6 +44,7 @@
4144
$ssl_port = $rabbitmq::params::ssl_port,
4245
$ssl_interface = $rabbitmq::params::ssl_interface,
4346
$ssl_management_port = $rabbitmq::params::ssl_management_port,
47+
$ssl_mqtt_port = $rabbitmq::params::ssl_mqtt_port,
4448
$ssl_stomp_port = $rabbitmq::params::ssl_stomp_port,
4549
$ssl_verify = $rabbitmq::params::ssl_verify,
4650
$ssl_fail_if_no_peer_cert = $rabbitmq::params::ssl_fail_if_no_peer_cert,
@@ -82,6 +86,8 @@
8286
validate_absolute_path($config_path)
8387
validate_bool($config_cluster)
8488
validate_bool($config_stomp)
89+
validate_bool($config_mqtt)
90+
validate_bool($mqtt_ensure)
8591
validate_string($default_user)
8692
validate_string($default_pass)
8793
validate_bool($delete_guest_user)
@@ -96,6 +102,9 @@
96102
if ! is_integer($port) {
97103
validate_re($port, ['\d+','UNSET'])
98104
}
105+
if ! is_integer($mqtt_port) {
106+
validate_re($mqtt_port, '\d+')
107+
}
99108
if ! is_integer($stomp_port) {
100109
validate_re($stomp_port, '\d+')
101110
}
@@ -120,6 +129,9 @@
120129
if ! is_integer($ssl_management_port) {
121130
validate_re($ssl_management_port, '\d+')
122131
}
132+
if ! is_integer($ssl_mqtt_port) {
133+
validate_re($ssl_mqtt_port, '\d+')
134+
}
123135
if ! is_integer($ssl_stomp_port) {
124136
validate_re($ssl_stomp_port, '\d+')
125137
}
@@ -217,6 +229,14 @@
217229
}
218230
}
219231

232+
if $mqtt_ensure {
233+
rabbitmq_plugin { 'rabbitmq_mqtt':
234+
ensure => present,
235+
require => Class['rabbitmq::install'],
236+
notify => Class['rabbitmq::service'],
237+
}
238+
}
239+
220240
if ($ldap_auth) {
221241
rabbitmq_plugin { 'rabbitmq_auth_backend_ldap':
222242
ensure => present,

manifests/params.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
$cluster_nodes = []
7878
$config = 'rabbitmq/rabbitmq.config.erb'
7979
$config_cluster = false
80+
$config_mqtt = false
8081
$config_path = '/etc/rabbitmq/rabbitmq.config'
8182
$config_stomp = false
8283
$default_user = 'guest'
@@ -86,6 +87,8 @@
8687
$env_config_path = '/etc/rabbitmq/rabbitmq-env.conf'
8788
$erlang_cookie = undef
8889
$interface = 'UNSET'
90+
$mqtt_ensure = false
91+
$mqtt_port = '1883'
8992
$node_ip_address = 'UNSET'
9093
$port = '5672'
9194
$tcp_keepalive = false
@@ -97,6 +100,7 @@
97100
$ssl_port = '5671'
98101
$ssl_interface = 'UNSET'
99102
$ssl_management_port = '15671'
103+
$ssl_mqtt_port = '8883'
100104
$ssl_stomp_port = '6164'
101105
$ssl_verify = 'verify_none'
102106
$ssl_fail_if_no_peer_cert = false

templates/rabbitmq.config.erb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@
9090
<%- end -%>
9191
]}
9292
<% end -%>
93+
<% if @config_mqtt -%>,
94+
{rabbitmq_mqtt, [
95+
{tcp_listeners, [<%= @mqtt_port %>]}
96+
<%- if @ssl && @ssl_mqtt_port -%>,
97+
{ssl_listeners, [<%= @ssl_mqtt_port %>]}
98+
<%- end -%>
99+
]}
100+
<% end -%>
93101
<%- if @ldap_auth -%>,
94102
% Configure the LDAP authentication plugin
95103
{rabbitmq_auth_backend_ldap, [

0 commit comments

Comments
 (0)