Dzahn has submitted this change and it was merged.
Change subject: ganeti, swift: fix 'variable not enclosed'
......................................................................
ganeti, swift: fix 'variable not enclosed'
Change-Id: Ief87e0695b54ece450b26078bfaf4ad59772974c
swift: fix 'variable not enclosed' -pt3
Change-Id: Ia60718fcd05c49211411330b909c3f3835fefdef
---
M manifests/role/ganeti.pp
M manifests/role/swift.pp
2 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index 53ef07f..2f73518 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -44,19 +44,19 @@
ferm::service { 'ganeti_ssh_cluster':
proto => 'tcp',
port => 'ssh',
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
# RAPI is the API of ganeti
ferm::service { 'ganeti_rapi_cluster':
proto => 'tcp',
port => 5080,
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
# Ganeti noded is responsible for all cluster/node actions
ferm::service { 'ganeti_noded_cluster':
proto => 'tcp',
port => 1811,
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
nrpe::monitor_service{ 'ganeti-noded':
description => 'ganeti-noded running',
@@ -67,7 +67,7 @@
ferm::service { 'ganeti_confd_cluster':
proto => 'udp',
port => 1814,
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
nrpe::monitor_service{ 'ganeti-confd':
description => 'ganeti-confd running',
@@ -78,7 +78,7 @@
ferm::service { 'ganeti_mond_cluster':
proto => 'tcp',
port => 1815,
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
nrpe::monitor_service{ 'ganeti-mond':
description => 'ganeti-mond running',
@@ -90,14 +90,14 @@
ferm::service { 'ganeti_drbd':
proto => 'tcp',
port => '11000:14999',
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
# Migration is done over TCP port
ferm::service { 'ganeti_migration':
proto => 'tcp',
port => 8102,
- srange => "@resolve(($ganeti_ferm_nodes))",
+ srange => "@resolve((${ganeti_ferm_nodes}))",
}
}
}
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 3bb4663..955c1d8 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -50,7 +50,7 @@
proto => 'tcp',
port => '11211',
notrack => true,
- srange => "@resolve(($swift_frontends_ferm))",
+ srange => "@resolve((${swift_frontends_ferm}))",
}
monitoring::service { 'swift-http-frontend':
@@ -98,28 +98,28 @@
proto => 'tcp',
port => '6000',
notrack => true,
- srange => "@resolve(($swift_access_ferm))",
+ srange => "@resolve((${swift_access_ferm}))",
}
ferm::service { 'swift-container-server':
proto => 'tcp',
port => '6001',
notrack => true,
- srange => "@resolve(($swift_access_ferm))",
+ srange => "@resolve((${swift_access_ferm}))",
}
ferm::service { 'swift-account-server':
proto => 'tcp',
port => '6002',
notrack => true,
- srange => "@resolve(($swift_access_ferm))",
+ srange => "@resolve((${swift_access_ferm}))",
}
ferm::service { 'swift-rsync':
proto => 'tcp',
port => '873',
notrack => true,
- srange => "@resolve(($swift_rsync_access_ferm))",
+ srange => "@resolve((${swift_rsync_access_ferm}))",
}
# these are already partitioned and xfs formatted by the installer
--
To view, visit https://gerrit.wikimedia.org/r/242056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia60718fcd05c49211411330b909c3f3835fefdef
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
