Thcipriani has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277423
Change subject: Pass deploy user from service::node
......................................................................
Pass deploy user from service::node
scap::target allows a user to be specified, pass that from service::node
Change-Id: Ibc76c5be838172f3036bc3dc8d1fe0cafb1214df
---
M modules/aqs/manifests/init.pp
M modules/service/manifests/deploy/scap.pp
M modules/service/manifests/node.pp
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/277423/1
diff --git a/modules/aqs/manifests/init.pp b/modules/aqs/manifests/init.pp
index eb1e385..4430392 100644
--- a/modules/aqs/manifests/init.pp
+++ b/modules/aqs/manifests/init.pp
@@ -72,6 +72,7 @@
auto_refresh => false,
init_restart => false,
deployment => 'scap3',
+ deployment_user => 'deploy-service',
}
}
diff --git a/modules/service/manifests/deploy/scap.pp
b/modules/service/manifests/deploy/scap.pp
index e234682..99e3ee5 100644
--- a/modules/service/manifests/deploy/scap.pp
+++ b/modules/service/manifests/deploy/scap.pp
@@ -24,9 +24,16 @@
$user = 'deploy-service',
$service_name = undef,
) {
+ $manage_user = false
+
+ if $user == 'deploy-service' {
+ $manage_user = true
+ }
+
scap::target { $title:
public_key_source => $public_key_file,
deploy_user => $user,
service_name => $service_name,
+ manage_user => $manage_user,
}
}
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index a161e2b..cdda829 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -99,12 +99,14 @@
$auto_refresh = true,
$init_restart = true,
$deployment = undef,
+ $deployment_user = $title,
) {
case $deployment {
'scap3': {
if ! defined(Service::Deploy::Trebuchet[$repo]) {
service::deploy::scap{ $repo:
service_name => $title,
+ user => $deployment_user,
before => Base::Service_unit[$title],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/277423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc76c5be838172f3036bc3dc8d1fe0cafb1214df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
