Alexandros Kosiaris has submitted this change and it was merged.
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, 42 insertions(+), 24 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/aqs/manifests/init.pp b/modules/aqs/manifests/init.pp
index eb1e385..1bba766 100644
--- a/modules/aqs/manifests/init.pp
+++ b/modules/aqs/manifests/init.pp
@@ -61,17 +61,21 @@
) {
service::node { 'aqs':
- port => $port,
- repo => 'analytics/aqs/deploy',
- config => template('aqs/config.yaml.erb'),
- full_config => true,
- no_file => 200000,
- healthcheck_url => '/analytics.wikimedia.org/v1',
- has_spec => true,
- local_logging => false,
- auto_refresh => false,
- init_restart => false,
- deployment => 'scap3',
+ port => $port,
+ repo => 'analytics/aqs/deploy',
+ config => template('aqs/config.yaml.erb'),
+ full_config => true,
+ no_file => 200000,
+ healthcheck_url => '/analytics.wikimedia.org/v1',
+ has_spec => true,
+ local_logging => false,
+ auto_refresh => false,
+ init_restart => false,
+ deployment => 'scap3',
+ # deployment_user set here since default values have changed to use
+ # $title as the deployment_user instead of 'deploy_service'.
+ deployment_user => 'deploy-service',
+ deployment_manage_user => true,
}
}
diff --git a/modules/service/manifests/deploy/scap.pp
b/modules/service/manifests/deploy/scap.pp
index e234682..1c52420 100644
--- a/modules/service/manifests/deploy/scap.pp
+++ b/modules/service/manifests/deploy/scap.pp
@@ -23,10 +23,12 @@
$public_key_file = 'puppet:///modules/service/servicedeploy_rsa.pub',
$user = 'deploy-service',
$service_name = undef,
+ $manage_user = false,
) {
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..33960f1 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -64,6 +64,14 @@
# If this value is set to 'scap3' then deploy via scap3, otherwise, use
trebuchet
# Default: undef
#
+# [*deployment_user*]
+# The user that will own the service code. Only applicable when
+# $deployment ='scap3'. Default: $title
+#
+# [*deployment_manage_user*]
+# Boolean. Whether or not scap::target manages user. Only applicable
+# when $deployment ='scap3'. Default: false
+#
# === Examples
#
# To set up a service named myservice on port 8520 and with a templated
@@ -86,26 +94,30 @@
#
define service::node(
$port,
- $config = undef,
- $full_config = false,
- $no_workers = 'ncpu',
- $no_file = 10000,
- $healthcheck_url = '/_info',
- $has_spec = false,
- $repo = "${title}/deploy",
- $firejail = true,
- $starter_script = 'src/server.js',
- $local_logging = true,
- $auto_refresh = true,
- $init_restart = true,
- $deployment = undef,
+ $config = undef,
+ $full_config = false,
+ $no_workers = 'ncpu',
+ $no_file = 10000,
+ $healthcheck_url = '/_info',
+ $has_spec = false,
+ $repo = "${title}/deploy",
+ $firejail = true,
+ $starter_script = 'src/server.js',
+ $local_logging = true,
+ $auto_refresh = true,
+ $init_restart = true,
+ $deployment = undef,
+ $deployment_user = $title,
+ $deployment_manage_user = false,
) {
case $deployment {
'scap3': {
if ! defined(Service::Deploy::Trebuchet[$repo]) {
service::deploy::scap{ $repo:
service_name => $title,
+ user => $deployment_user,
before => Base::Service_unit[$title],
+ manage_user => $deployment_manage_user,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/277423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc76c5be838172f3036bc3dc8d1fe0cafb1214df
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
