Elukey has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311139

Change subject: Add the deployment_key class variable to service::node
......................................................................

Add the deployment_key class variable to service::node

It would be great to specify a different Keyholder key to use
like scap::target let's you do it. Moreover it seems to me that
the default $deployment_user is 'deploy-service', not $title.

Change-Id: I5ab2616d28e1e149f8e6cc254a4a59545d973c9f
---
M modules/service/manifests/node.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/311139/1

diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index fb466fc..b4fafd7 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -97,7 +97,11 @@
 #
 # [*deployment_user*]
 #   The user that will own the service code. Only applicable when
-#   $deployment =='scap3'. Default: $title
+#   $deployment =='scap3'. Default: 'deploy-service'
+#
+# [*deployment_key*]
+#   The keyholder's key that will be used. Only applicable when
+#   $deployment =='scap3'. Default: 'deploy-service'
 #
 # [*deployment_config*]
 #   Whether Scap3 is used for deploying the config as well. Applicable only 
when
@@ -166,6 +170,7 @@
     $environment     = undef,
     $deployment      = undef,
     $deployment_user = 'deploy-service',
+    $deployment_key  = 'deploy-service',
     $deployment_config = false,
     $deployment_vars = {},
     $contact_groups  = hiera('contactgroups', 'admins'),
@@ -177,6 +182,7 @@
                 scap::target { $repo:
                     service_name => $title,
                     deploy_user  => $deployment_user,
+                    key_name     => $deployment_key,
                     before       => Base::Service_unit[$title],
                     manage_user  => true,
                 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ab2616d28e1e149f8e6cc254a4a59545d973c9f
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