Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203035
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
A hieradata/role/common/ganeti.yaml
M manifests/role/ganeti.pp
4 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/203035/1
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
new file mode 100644
index 0000000..d8d86b3
--- /dev/null
+++ b/hieradata/role/common/ganeti.yaml
@@ -0,0 +1,12 @@
+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 029743d..6ac510d 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -45,7 +45,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: newchange
Gerrit-Change-Id: I5e7c19b3001925878dce1df85542c66f2079b31b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
