Dzahn has submitted this change and it was merged.

Change subject: hooft: Use the role keyword
......................................................................


hooft: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: I153b1700fb9f139e2d38273c04b753255830bbce
---
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 dc4064d..328b135 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1095,10 +1095,9 @@
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
-    role bastionhost::general
+    role bastionhost::general, installserver::tftp-server
 
     include standard
-    include role::installserver::tftp-server
 
     class { 'ganglia::monitor::aggregator':
         sites =>  'esams',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I153b1700fb9f139e2d38273c04b753255830bbce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[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

Reply via email to