Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371014 )

Change subject: role:eventubus: set deploy-service as scap deploy_user
......................................................................

role:eventubus: set deploy-service as scap deploy_user

Bug: T171506
Change-Id: I02f18ef4c506f02ec28d26bd32a0ec8c1dbf48e8
---
M modules/eventlogging/manifests/deployment/target.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/role/manifests/eventlogging/analytics/server.pp
3 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/371014/1

diff --git a/modules/eventlogging/manifests/deployment/target.pp 
b/modules/eventlogging/manifests/deployment/target.pp
index 4c9fc38..831735e 100644
--- a/modules/eventlogging/manifests/deployment/target.pp
+++ b/modules/eventlogging/manifests/deployment/target.pp
@@ -18,6 +18,9 @@
 #   Array of extra sudo rules to pass to scap::target.
 #   Default: undef
 #
+# [*deploy_user*]
+#   The scap deploy-user.
+#
 # == Usage
 #
 #   # Deploy eventlogging/eventbus here, and allow
@@ -36,13 +39,14 @@
     $package_name = "eventlogging/${title}",
     $service_name = undef,
     $sudo_rules   = undef,
+    deploy_user,
 ) {
     # Install eventlogging dependencies from .deb packages.
     include ::eventlogging::dependencies
 
     scap::target { "eventlogging/${title}":
         package_name => $package_name,
-        deploy_user  => 'eventlogging',
+        deploy_user  => $deploy_user,
         service_name => $service_name,
         sudo_rules   => $sudo_rules,
         manage_user  => false,
diff --git a/modules/role/manifests/eventbus/eventbus.pp 
b/modules/role/manifests/eventbus/eventbus.pp
index 9433b4e..459b8bb 100644
--- a/modules/role/manifests/eventbus/eventbus.pp
+++ b/modules/role/manifests/eventbus/eventbus.pp
@@ -26,6 +26,7 @@
     # via scap/scap.cfg on the deployment host.
     eventlogging::deployment::target { 'eventbus':
         service_name        => 'eventlogging-service-eventbus',
+        deploy_user         => 'deploy-service',
     }
 
     # Include eventlogging server configuration, including
diff --git a/modules/role/manifests/eventlogging/analytics/server.pp 
b/modules/role/manifests/eventlogging/analytics/server.pp
index dffe570..a404c6c 100644
--- a/modules/role/manifests/eventlogging/analytics/server.pp
+++ b/modules/role/manifests/eventlogging/analytics/server.pp
@@ -8,7 +8,10 @@
 
     # EventLogging for analytics processing is deployed
     # as the eventlogging/analytics scap target.
-    eventlogging::deployment::target { 'analytics': }
+    eventlogging::deployment::target { 'analytics':
+        deploy_user => 'eventLogging',
+    }
+
     class { 'eventlogging::server':
         eventlogging_path => '/srv/deployment/eventlogging/analytics'
     }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02f18ef4c506f02ec28d26bd32a0ec8c1dbf48e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to