Skip to content

Commit 543c5f7

Browse files
author
Taylan Develioglu
committed
Scope all variables
1 parent f65ca12 commit 543c5f7

File tree

7 files changed

+65
-65
lines changed

7 files changed

+65
-65
lines changed

‎manifests/check.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@
8484
consul_validate_checks($check_hash[check])
8585

8686
$escaped_id = regsubst($id,'\/','_','G')
87-
File[$consul::config_dir] ->
87+
File[$::consul::config_dir] ->
8888
file { "${consul::config_dir}/check_${escaped_id}.json":
8989
ensure => $ensure,
90-
owner => $consul::user,
91-
group => $consul::group,
92-
mode => $consul::config_mode,
93-
content => consul_sorted_json($check_hash, $consul::pretty_config, $consul::pretty_config_indent),
90+
owner => $::consul::user,
91+
group => $::consul::group,
92+
mode => $::consul::config_mode,
93+
content => consul_sorted_json($check_hash, $::consul::pretty_config, $::consul::pretty_config_indent),
9494
} ~> Class['consul::reload_service']
9595
}

‎manifests/config.pp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
$purge = true,
1616
) {
1717

18-
if $consul::init_style {
18+
if $::consul::init_style {
1919

20-
case $consul::init_style {
20+
case $::consul::init_style {
2121
'upstart': {
2222
file { '/etc/init/consul.conf':
2323
mode => '0444',
@@ -84,20 +84,20 @@
8484
}
8585
}
8686

87-
file { $consul::config_dir:
87+
file { $::consul::config_dir:
8888
ensure => 'directory',
89-
owner => $consul::user,
90-
group => $consul::group,
89+
owner => $::consul::user,
90+
group => $::consul::group,
9191
purge => $purge,
9292
recurse => $purge,
9393
} ->
9494
file { 'consul config.json':
9595
ensure => present,
9696
path => "${consul::config_dir}/config.json",
97-
owner => $consul::user,
98-
group => $consul::group,
99-
mode => $consul::config_mode,
100-
content => consul_sorted_json($config_hash, $consul::pretty_config, $consul::pretty_config_indent),
97+
owner => $::consul::user,
98+
group => $::consul::group,
99+
mode => $::consul::config_mode,
100+
content => consul_sorted_json($config_hash, $::consul::pretty_config, $::consul::pretty_config_indent),
101101
}
102102

103103
}

‎manifests/install.pp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#
55
class consul::install {
66

7-
if $consul::data_dir {
8-
file { $consul::data_dir:
7+
if $::consul::data_dir {
8+
file { $::consul::data_dir:
99
ensure => 'directory',
10-
owner => $consul::user,
11-
group => $consul::group,
10+
owner => $::consul::user,
11+
group => $::consul::group,
1212
mode => '0755',
1313
}
1414
}
1515

16-
case $consul::install_method {
16+
case $::consul::install_method {
1717
'url': {
18-
$install_path = $consul::archive_path
18+
$install_path = $::consul::archive_path
1919

2020
# only notify if we are installing a new version (work around for switching to archive module)
21-
if $::consul_version != $consul::version {
22-
$do_notify_service = $consul::notify_service
21+
if $::consul_version != $::consul::version {
22+
$do_notify_service = $::consul::notify_service
2323
} else {
2424
$do_notify_service = undef
2525
}
@@ -35,7 +35,7 @@
3535
}->
3636
archive { "${install_path}/consul-${consul::version}.${consul::download_extension}":
3737
ensure => present,
38-
source => $consul::real_download_url,
38+
source => $::consul::real_download_url,
3939
extract => true,
4040
extract_path => "${install_path}/consul-${consul::version}",
4141
creates => "${install_path}/consul-${consul::version}/consul",
@@ -51,7 +51,7 @@
5151
target => "${install_path}/consul-${consul::version}/consul";
5252
}
5353

54-
if ($consul::ui_dir and $consul::data_dir) {
54+
if ($::consul::ui_dir and $::consul::data_dir) {
5555

5656
# The 'dist' dir was removed from the web_ui archive in Consul version 0.6.0
5757
if (versioncmp($::consul::version, '0.6.0') < 0) {
@@ -67,35 +67,35 @@
6767
}->
6868
archive { "${install_path}/consul_web_ui-${consul::version}.zip":
6969
ensure => present,
70-
source => $consul::real_ui_download_url,
70+
source => $::consul::real_ui_download_url,
7171
extract => true,
7272
extract_path => "${install_path}/consul-${consul::version}_web_ui",
7373
creates => $archive_creates,
7474
}->
75-
file { $consul::ui_dir:
75+
file { $::consul::ui_dir:
7676
ensure => 'symlink',
7777
target => $ui_symlink_target,
7878
}
7979
}
8080
}
8181
'package': {
82-
package { $consul::package_name:
83-
ensure => $consul::package_ensure,
82+
package { $::consul::package_name:
83+
ensure => $::consul::package_ensure,
8484
}
8585

86-
if $consul::ui_dir {
87-
package { $consul::ui_package_name:
88-
ensure => $consul::ui_package_ensure,
89-
require => Package[$consul::package_name]
86+
if $::consul::ui_dir {
87+
package { $::consul::ui_package_name:
88+
ensure => $::consul::ui_package_ensure,
89+
require => Package[$::consul::package_name]
9090
}
9191
}
9292

93-
if $consul::manage_user {
94-
User[$consul::user] -> Package[$consul::package_name]
93+
if $::consul::manage_user {
94+
User[$::consul::user] -> Package[$::consul::package_name]
9595
}
9696

97-
if $consul::data_dir {
98-
Package[$consul::package_name] -> File[$consul::data_dir]
97+
if $::consul::data_dir {
98+
Package[$::consul::package_name] -> File[$::consul::data_dir]
9999
}
100100
}
101101
'none': {}
@@ -104,19 +104,19 @@
104104
}
105105
}
106106

107-
if $consul::manage_user {
108-
user { $consul::user:
107+
if $::consul::manage_user {
108+
user { $::consul::user:
109109
ensure => 'present',
110110
system => true,
111-
groups => $consul::extra_groups,
111+
groups => $::consul::extra_groups,
112112
}
113113

114-
if $consul::manage_group {
115-
Group[$consul::group] -> User[$consul::user]
114+
if $::consul::manage_group {
115+
Group[$::consul::group] -> User[$::consul::user]
116116
}
117117
}
118-
if $consul::manage_group {
119-
group { $consul::group:
118+
if $::consul::manage_group {
119+
group { $::consul::group:
120120
ensure => 'present',
121121
system => true,
122122
}

‎manifests/reload_service.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99

1010
# Don't attempt to reload if we're not supposed to be running.
1111
# This can happen during pre-provisioning of a node.
12-
if $consul::manage_service == true and $consul::service_ensure == 'running' {
12+
if $::consul::manage_service == true and $::consul::service_ensure == 'running' {
1313

1414
# Make sure we don't try to connect to 0.0.0.0, use 127.0.0.1 instead
1515
# This can happen if the consul agent RPC port is bound to 0.0.0.0
16-
if $consul::rpc_addr == '0.0.0.0' {
16+
if $::consul::rpc_addr == '0.0.0.0' {
1717
$rpc_addr = '127.0.0.1'
1818
} else {
19-
$rpc_addr = $consul::rpc_addr
19+
$rpc_addr = $::consul::rpc_addr
2020
}
2121

2222
exec { 'reload consul service':
23-
path => [$consul::bin_dir,'/bin','/usr/bin'],
23+
path => [$::consul::bin_dir,'/bin','/usr/bin'],
2424
command => "consul reload -rpc-addr=${rpc_addr}:${consul::rpc_port}",
2525
refreshonly => true,
2626
tries => 3,

‎manifests/run_service.pp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
#
66
class consul::run_service {
77

8-
$init_selector = $consul::init_style ? {
8+
$init_selector = $::consul::init_style ? {
99
'launchd' => 'io.consul.daemon',
1010
default => 'consul',
1111
}
1212

13-
if $consul::manage_service == true and $consul::init_style {
13+
if $::consul::manage_service == true and $::consul::init_style {
1414
service { 'consul':
15-
ensure => $consul::service_ensure,
15+
ensure => $::consul::service_ensure,
1616
name => $init_selector,
17-
enable => $consul::service_enable,
18-
provider => $consul::init_style,
17+
enable => $::consul::service_enable,
18+
provider => $::consul::init_style,
1919
}
2020
}
2121

22-
if $consul::join_wan {
22+
if $::consul::join_wan {
2323
exec { 'join consul wan':
24-
cwd => $consul::config_dir,
25-
path => [$consul::bin_dir,'/bin','/usr/bin'],
24+
cwd => $::consul::config_dir,
25+
path => [$::consul::bin_dir,'/bin','/usr/bin'],
2626
command => "consul join -wan ${consul::join_wan}",
2727
unless => "consul members -wan -detailed | grep -vP \"dc=${consul::config_hash_real['datacenter']}\" | grep -P 'alive'",
2828
subscribe => Service['consul'],

‎manifests/service.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
$escaped_id = regsubst($id,'\/','_','G')
6767
file { "${consul::config_dir}/service_${escaped_id}.json":
6868
ensure => $ensure,
69-
owner => $consul::user,
70-
group => $consul::group,
71-
mode => $consul::config_mode,
72-
content => consul_sorted_json($service_hash, $consul::pretty_config, $consul::pretty_config_indent),
73-
require => File[$consul::config_dir],
69+
owner => $::consul::user,
70+
group => $::consul::group,
71+
mode => $::consul::config_mode,
72+
content => consul_sorted_json($service_hash, $::consul::pretty_config, $::consul::pretty_config_indent),
73+
require => File[$::consul::config_dir],
7474
} ~> Class['consul::reload_service']
7575
}

‎manifests/watch.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@
133133
watches => [delete_undef_values(merge($basic_hash, $type_hash))]
134134
}
135135

136-
File[$consul::config_dir] ->
136+
File[$::consul::config_dir] ->
137137
file { "${consul::config_dir}/watch_${id}.json":
138138
ensure => $ensure,
139-
owner => $consul::user,
140-
group => $consul::group,
141-
mode => $consul::config_mode,
142-
content => consul_sorted_json($watch_hash, $consul::pretty_config, $consul::pretty_config_indent),
139+
owner => $::consul::user,
140+
group => $::consul::group,
141+
mode => $::consul::config_mode,
142+
content => consul_sorted_json($watch_hash, $::consul::pretty_config, $::consul::pretty_config_indent),
143143
} ~> Class['consul::reload_service']
144144
}

0 commit comments

Comments
 (0)