Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: scap: add conftool class
......................................................................
scap: add conftool class
For a wide variety of hosts, scap will need to be able to
programmatically pool/depool hosts when deploying a change; it will be
enough to include the scap::conftool class in your project in order to
have that work.
Change-Id: I8b874b7b758f2dda123449532fd9451fbcfc1a47
---
M modules/conftool/manifests/credentials.pp
A modules/scap/manifests/conftool.pp
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
Mobrovac: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/conftool/manifests/credentials.pp
b/modules/conftool/manifests/credentials.pp
index ff40ac7..46229ad 100644
--- a/modules/conftool/manifests/credentials.pp
+++ b/modules/conftool/manifests/credentials.pp
@@ -12,7 +12,7 @@
etcd::client::config { "${home}/.etcdrc":
ensure => present,
owner => $title,
- group => $title,
+ group => $group,
settings => {
username => 'conftool',
password => $::conftool::password,
diff --git a/modules/scap/manifests/conftool.pp
b/modules/scap/manifests/conftool.pp
new file mode 100644
index 0000000..612364b
--- /dev/null
+++ b/modules/scap/manifests/conftool.pp
@@ -0,0 +1,12 @@
+# === Class scap::conftool
+#
+# Adds conftool scripts and credentials for the deploy-service user, used by
+# scap3. This will allow scap3 to call "pool", "depool" and so on
+#
+class scap::conftool {
+ include ::conftool::scripts
+
+ ::conftool::credentials { 'deploy-service':
+ home => '/var/lib/scap',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/305278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b874b7b758f2dda123449532fd9451fbcfc1a47
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
