Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #11 from bodepd/style_update

(#10242) Update Style
  • Loading branch information...
commit 126dbdbb0193ee89a1d3218030acda35017917c5 2 parents 0bd6838 + 929bfbf
@kbarber kbarber authored
View
2  manifests/plugin.pp
@@ -16,7 +16,7 @@
#
define rabbitmq::plugin( $ensure=present, $source='UNSET') {
- $plugin_dir = $::rabbitmq::server::plugin_dir_real
+ $plugin_dir = $::rabbitmq::server::plugin_dir
if $source == 'UNSET' {
$source_real = "puppet:///modules/rabbitmq/plugins/${name}"
View
27 manifests/server.pp
@@ -40,15 +40,6 @@
validate_re($port, '\d+')
validate_re($stomp_port, '\d+')
- $port_real = $port
- $package_name_real = $package_name
- $service_name_real = $service_name
- $service_ensure_real = $service_ensure
- $stomp_package_real = $stomp_package
- $install_stomp_real = $install_stomp
- $delete_guest_user_real = $delete_guest_user
- $stomp_port_real = $stomp_port
-
if $version == 'UNSET' {
$version_real = '2.4.1'
$pkg_ensure_real = 'present'
@@ -67,15 +58,15 @@
$env_config_real = $env_config
}
- $plugin_dir_real = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version_real}/plugins"
+ $plugin_dir = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version_real}/plugins"
- package { $package_name_real:
+ package { $package_name:
ensure => $pkg_ensure_real,
notify => Class['rabbitmq::service'],
}
- if $install_stomp_real {
- package { $stomp_package_real:
+ if $install_stomp {
+ package { $stomp_package:
ensure => installed,
notify => Class['rabbitmq::service'],
before => File['rabbitmq.config'],
@@ -87,7 +78,7 @@
owner => '0',
group => '0',
mode => '0644',
- require => Package[$package_name_real],
+ require => Package[$package_name],
}
file { 'rabbitmq.config':
@@ -98,7 +89,7 @@
group => '0',
mode => '0644',
notify => Class['rabbitmq::service'],
- require => Package[$package_name_real]
+ require => Package[$package_name]
}
file { 'rabbitmq-env.config':
@@ -112,11 +103,11 @@
}
class { 'rabbitmq::service':
- service_name => $service_name_real,
- ensure => $service_ensure_real,
+ service_name => $service_name,
+ ensure => $service_ensure,
}
- if $delete_guest_user_real {
+ if $delete_guest_user {
# delete the default guest user
rabbitmq_user{ 'guest':
ensure => absent,
View
4 manifests/service.pp
@@ -18,8 +18,6 @@
$ensure='running'
) {
- $service_name_real = $service_name
-
validate_re($ensure, '^(running|stopped)$')
if $ensure == 'running' {
Class['rabbitmq::service'] -> Rabbitmq_user<| |>
@@ -32,7 +30,7 @@
$enable_real = false
}
- service { $service_name_real:
+ service { $service_name:
ensure => $ensure_real,
enable => $enable_real,
hasstatus => true,
View
2  templates/rabbitmq-env.conf.erb
@@ -1 +1 @@
-RABBITMQ_NODE_PORT=<%= port_real %>
+RABBITMQ_NODE_PORT=<%= port %>
View
4 templates/rabbitmq.config
@@ -1,8 +1,8 @@
% This file managed by Puppet <%= puppetversion %>
% Template Path: <%= module_name %>/templates/rabbitmq.config
-<% if install_stomp_real -%>
+<% if install_stomp -%>
% Configure the Stomp Plugin listening port
-[ {rabbit_stomp, [{tcp_listeners, [<%= stomp_port_real %>]} ]} ].
+[ {rabbit_stomp, [{tcp_listeners, [<%= stomp_port %>]} ]} ].
<% end -%>
[].
% EOF
Please sign in to comment.
Something went wrong with that request. Please try again.