Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111781
Change subject: toollabs: puppet 3 compatibility fix: fully qualify variables
......................................................................
toollabs: puppet 3 compatibility fix: fully qualify variables
Change-Id: I24ac0ba53d828d751a52e15df5a3cafb5dae1812
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/execnode.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/webnode.pp
M modules/toollabs/manifests/webserver.pp
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/111781/1
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index e7ac545..fd19f36 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -35,13 +35,13 @@
source =>
"puppet:///modules/toollabs/40-${instanceproject}-bastion-banner",
}
- file { "${store}/submithost-${fqdn}":
+ file { "${store}/submithost-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
require => File[$store],
- content => "${ipaddress}\n",
+ content => "${::ipaddress}\n",
}
file { '/usr/bin/sql':
diff --git a/modules/toollabs/manifests/execnode.pp
b/modules/toollabs/manifests/execnode.pp
index 0597c00..615f30b 100644
--- a/modules/toollabs/manifests/execnode.pp
+++ b/modules/toollabs/manifests/execnode.pp
@@ -26,13 +26,13 @@
source =>
"puppet:///modules/toollabs/40-${instanceproject}-exechost-banner",
}
- file { "${store}/execnode-${fqdn}":
+ file { "${store}/execnode-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
require => File[$store],
- content => "${ipaddress}\n",
+ content => "${::ipaddress}\n",
}
# Execution hosts have funky access requirements; they need to be ssh-able
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 48190e5..244ce54 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -34,13 +34,13 @@
require => Service['autofs'],
}
- file { "${store}/hostkey-${fqdn}":
+ file { "${store}/hostkey-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
require => File[$store],
- content => "[${fqdn}]:*,[${ipaddress}]:* ssh-rsa ${sshrsakey}\n${fqdn}
ssh-rsa ${sshrsakey}\n",
+ content => "[${::fqdn}]:*,[${::ipaddress}]:* ssh-rsa
${::sshrsakey}\n${::fqdn} ssh-rsa ${::sshrsakey}\n",
}
exec { 'make_known_hosts':
diff --git a/modules/toollabs/manifests/webnode.pp
b/modules/toollabs/manifests/webnode.pp
index 7dbf477..d263962 100644
--- a/modules/toollabs/manifests/webnode.pp
+++ b/modules/toollabs/manifests/webnode.pp
@@ -21,13 +21,13 @@
gridmaster => $gridmaster,
}
- file { "${store}/execnode-${fqdn}":
+ file { "${store}/execnode-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
require => File[$store],
- content => "${ipaddress}\n",
+ content => "${::ipaddress}\n",
}
# Execution hosts have funky access requirements; they need to be ssh-able
diff --git a/modules/toollabs/manifests/webserver.pp
b/modules/toollabs/manifests/webserver.pp
index 2d3c608..77a97ab 100644
--- a/modules/toollabs/manifests/webserver.pp
+++ b/modules/toollabs/manifests/webserver.pp
@@ -25,13 +25,13 @@
ensure => present
}
- file { "${store}/submithost-${fqdn}":
+ file { "${store}/submithost-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode => '0444',
require => File[$store],
- content => "${ipaddress}\n",
+ content => "${::ipaddress}\n",
}
file { '/etc/ssh/ssh_config':
--
To view, visit https://gerrit.wikimedia.org/r/111781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24ac0ba53d828d751a52e15df5a3cafb5dae1812
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
