Muehlenhoff has submitted this change and it was merged.
Change subject: Move base::debdeploy into the base class
......................................................................
Move base::debdeploy into the base class
Change-Id: I95edea60fe44c75e7e120a7334c779e4c06d5c71
---
M manifests/site.pp
M modules/base/manifests/init.pp
2 files changed, 1 insertion(+), 6 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 4225678..25c5c32 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -148,7 +148,6 @@
include role::analytics::impala::master
include role::logging::udp2log::misc
include base::firewall
- include base::debdeploy
# lint:ignore:quoted_booleans
# salt grain values are passed to a shell command
salt::grain { 'debdeploy-analytics': value => 'true' }
@@ -1824,7 +1823,6 @@
include passwords::redis
include redis
include redis::ganglia
- include base::debdeploy
include base::firewall
# lint:ignore:quoted_booleans
salt::grain { 'debdeploy-memcached': value => 'true' }
@@ -1900,7 +1898,6 @@
node /^ms-fe300[1-2]\.esams\.wmnet$/ {
role swift::proxy
- include base::debdeploy
# lint:ignore:quoted_booleans
salt::grain { 'debdeploy-swift-proxy': value => 'true' }
# lint:endignore
@@ -1908,7 +1905,6 @@
node /^ms-be300[1-4]\.esams\.wmnet$/ {
role swift::storage
- include base::debdeploy
# lint:ignore:quoted_booleans
salt::grain { 'debdeploy-swift-storage': value => 'true' }
# lint:endignore
@@ -2229,7 +2225,6 @@
node 'osmium.eqiad.wmnet' {
role ve
include ::standard
- include base::debdeploy
}
# oxygen runs a kafkatee instance that consumes webrequest from Kafka
@@ -2302,7 +2297,6 @@
node 'radium.wikimedia.org' {
include base::firewall
include standard
- include base::debdeploy
include role::tor
interface::add_ip6_mapped { 'main':
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 4899dc9..1871864 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -32,6 +32,7 @@
include role::trebuchet
include nrpe
include base::kernel
+ include base::debdeploy
# include base::monitor::host.
# if contactgroups is set, then use it
--
To view, visit https://gerrit.wikimedia.org/r/246220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95edea60fe44c75e7e120a7334c779e4c06d5c71
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
