[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools clush: exclude puppetmaster from hostgroup

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381122 )

Change subject: tools clush: exclude puppetmaster from hostgroup
..


tools clush: exclude puppetmaster from hostgroup

Generally we're using clush to manage those hosts
that are managed by the tools puppetmaster.  The
puppetmaster itself is a special case that clush
doesn't work for in the current setup.

Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
---
M modules/role/files/toollabs/clush/tools-clush-generator
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
index 0cabe16..5266762 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -63,6 +63,11 @@
 )
 for instance in client.servers.list():
 name = instance.name
+if name.startswith('tools-puppetmaster'):
+# To avoid chicken/egg strangeness, the tools puppetmaster
+#  is not itself managed by the tools puppetmaster.  That
+#  means clush keys aren't set up there.
+continue
 for prefix in classifier:
 if name.startswith('tools-' + prefix):
 role = classifier[prefix]

-- 
To view, visit https://gerrit.wikimedia.org/r/381122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools clush: exclude puppetmaster from hostgroup

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381122 )

Change subject: tools clush: exclude puppetmaster from hostgroup
..

tools clush: exclude puppetmaster from hostgroup

Generally we're using clush to manage those hosts
that are managed by the tools puppetmaster.  The
puppetmaster itself is a special case that clush
doesn't work for in the current setup.

Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
---
M modules/role/files/toollabs/clush/tools-clush-generator
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/381122/1

diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
index 0cabe16..5266762 100644
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ b/modules/role/files/toollabs/clush/tools-clush-generator
@@ -63,6 +63,11 @@
 )
 for instance in client.servers.list():
 name = instance.name
+if name.startswith('tools-puppetmaster'):
+# To avoid chicken/egg strangeness, the tools puppetmaster
+#  is not itself managed by the tools puppetmaster.  That
+#  means clush keys aren't set up there.
+continue
 for prefix in classifier:
 if name.startswith('tools-' + prefix):
 role = classifier[prefix]

-- 
To view, visit https://gerrit.wikimedia.org/r/381122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e10068c86c9bb21c03c67c78b4cbf20928ee56c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits