Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339603 )
Change subject: Add passwords::etcd
......................................................................
Add passwords::etcd
Change-Id: Ie57ebd4d9aa63d1196f1f653b08b5d83e14a6508
---
M modules/passwords/manifests/init.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/private
refs/changes/03/339603/1
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index d2d249e..e4913a4 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -500,3 +500,12 @@
$db_password = 'notsecret'
}
+<<<<<<< HEAD
+=======
+class passwords::etcd {
+ $accounts = {
+ 'root' => 'Wikipedia',
+ 'conftool' => 'another_secret',
+ }
+}
+>>>>>>> 041e298... Add passwords::etcd
--
To view, visit https://gerrit.wikimedia.org/r/339603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie57ebd4d9aa63d1196f1f653b08b5d83e14a6508
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
