coren has submitted this change and it was merged.
Change subject: Tool Labs: web nodes are not infrastructure
......................................................................
Tool Labs: web nodes are not infrastructure
Making them infrastructure causes the access.conf to be
overriden twice, with different settings.
Change-Id: Ia7f3e823d84ee3fc48fd62cbb546d88d14faa8f9
---
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/node/web.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/infrastructure.pp
b/modules/toollabs/manifests/infrastructure.pp
index 7bf3fc5..a8d5169 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -26,6 +26,7 @@
# service group and root.
File <| title == '/etc/security/access.conf' |> {
+ source => undef,
content => "-:ALL EXCEPT (${::instanceproject}.admin) root:ALL\n",
}
}
diff --git a/modules/toollabs/manifests/node/web.pp
b/modules/toollabs/manifests/node/web.pp
index 3bfdb63..bf59452 100644
--- a/modules/toollabs/manifests/node/web.pp
+++ b/modules/toollabs/manifests/node/web.pp
@@ -14,8 +14,7 @@
#
class toollabs::node::web inherits toollabs {
- include gridengine::submit_host,
- toollabs::infrastructure
+ include gridengine::submit_host
file { '/usr/local/bin/portgrabber':
ensure => file,
--
To view, visit https://gerrit.wikimedia.org/r/168171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7f3e823d84ee3fc48fd62cbb546d88d14faa8f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
