Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ganeti: Reference correctly the ganeti cluster nodes
......................................................................
ganeti: Reference correctly the ganeti cluster nodes
Fix a typo in the role and move the configuration under the role backend
Change-Id: I5e7c19b3001925878dce1df85542c66f2079b31b
---
D hieradata/codfw/ganeti.yaml
D hieradata/eqiad/ganeti.yaml
M hieradata/role/common/ganeti.yaml
M manifests/role/ganeti.pp
4 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw/ganeti.yaml b/hieradata/codfw/ganeti.yaml
deleted file mode 100644
index 4973f95..0000000
--- a/hieradata/codfw/ganeti.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-ganeti01.svc.codfw.wmnet::nodes:
- - ganeti2001.codfw.wmnet
- - ganeti2002.codfw.wmnet
- - ganeti2003.codfw.wmnet
- - ganeti2004.codfw.wmnet
- - ganeti2005.codfw.wmnet
- - ganeti2006.codfw.wmnet
diff --git a/hieradata/eqiad/ganeti.yaml b/hieradata/eqiad/ganeti.yaml
deleted file mode 100644
index 71034f9..0000000
--- a/hieradata/eqiad/ganeti.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-ganeti01.svc.eqiad.wmnet::nodes:
- - ganeti1001.eqiad.wmnet
- - ganeti1002.eqiad.wmnet
- - ganeti1003.eqiad.wmnet
- - ganeti1004.eqiad.wmnet
diff --git a/hieradata/role/common/ganeti.yaml
b/hieradata/role/common/ganeti.yaml
index f4aa10c..728511c 100644
--- a/hieradata/role/common/ganeti.yaml
+++ b/hieradata/role/common/ganeti.yaml
@@ -1 +1,13 @@
ssh::server::authorized_keys_file: /etc/ssh/userkeys/%u
/etc/ssh/userkeys/%u.d/ganeti .ssh/authorized_keys
+ganeti::ganeti01.svc.codfw.wmnet::nodes:
+ - ganeti2001.codfw.wmnet
+ - ganeti2002.codfw.wmnet
+ - ganeti2003.codfw.wmnet
+ - ganeti2004.codfw.wmnet
+ - ganeti2005.codfw.wmnet
+ - ganeti2006.codfw.wmnet
+ganeti::ganeti01.svc.eqiad.wmnet::nodes:
+ - ganeti1001.eqiad.wmnet
+ - ganeti1002.eqiad.wmnet
+ - ganeti1003.eqiad.wmnet
+ - ganeti1004.eqiad.wmnet
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index b714460..2770c43 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -33,7 +33,7 @@
include base::firewall
# Interpolate the ganeti_cluster fact to get the list of nodes in a
# cluster
- $ganeti_nodes = hiera('ganeti::%{::ganeti_cluster}::nodes')
+ $ganeti_nodes = hiera("ganeti::${::ganeti_cluster}::nodes")
$ganeti_ferm_nodes = join($ganeti_nodes, ' ')
# Same ganeti actions require SSH
--
To view, visit https://gerrit.wikimedia.org/r/203035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e7c19b3001925878dce1df85542c66f2079b31b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
