Dzahn has submitted this change and it was merged.
Change subject: labcontrol2001: Use the role keyword
......................................................................
labcontrol2001: Use the role keyword
We need this for Hiera-based assignment of Salt grains for debdeploy
Change-Id: If8a8f1529aa79d7a00ef99e72f8712448c96bab6
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 90bee6c..f6198d6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1234,11 +1234,10 @@
#$is_labs_puppet_master = true
#$use_neutron = false
+ role dns::ldap, salt::masters::labs
include standard
include base::firewall
- include role::dns::ldap
include ldap::role::client::labs
- include role::salt::masters::labs
#include role::nova::controller
#include role::nova::manager
--
To view, visit https://gerrit.wikimedia.org/r/247204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8a8f1529aa79d7a00ef99e72f8712448c96bab6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
