summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-11-27 14:03:03 -0500
committerMicah Anderson <micah@leap.se>2013-11-27 14:48:00 -0500
commitfdf028e53cb1efa9d3d6c8ab76c89f98e2fb7498 (patch)
treef1bd71e534fde2ef8a866d5c7b2c18fbc16609fa
parent77528b228c6d7ba095a796df4c5cc4c95eb50d9d (diff)
add leap_mx couchdb user/password
Change-Id: Ice83115e0feabddd40ad74c2a6e98e24da9b4c2f
-rw-r--r--provider_base/services/couchdb.json5
-rw-r--r--puppet/modules/site_couchdb/manifests/add_users.pp7
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp5
3 files changed, 17 insertions, 0 deletions
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 95ab75f1..61b97da1 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -23,6 +23,11 @@
"password": "= secret :couch_admin_password",
"salt": "= hex_secret :couch_admin_password_salt, 128"
},
+ "leap_mx": {
+ "username": "leap_mx",
+ "password": "= secret :couch_leap_mx_password",
+ "salt": "= hex_secret :couch_leap_mx_password_salt, 128"
+ },
"soledad": {
"username": "soledad",
"password": "= secret :couch_soledad_password",
diff --git a/puppet/modules/site_couchdb/manifests/add_users.pp b/puppet/modules/site_couchdb/manifests/add_users.pp
index b9304a97..c83b096d 100644
--- a/puppet/modules/site_couchdb/manifests/add_users.pp
+++ b/puppet/modules/site_couchdb/manifests/add_users.pp
@@ -2,6 +2,13 @@ class site_couchdb::add_users {
# Populate couchdb
+ couchdb::add_user { $site_couchdb::couchdb_leap_mx_user:
+ roles => '["identities"]',
+ pw => $site_couchdb::couchdb_leap_mx_pw,
+ salt => $site_couchdb::couchdb_leap_mx_salt,
+ require => Couchdb::Query::Setup['localhost']
+ }
+
couchdb::add_user { $site_couchdb::couchdb_soledad_user:
roles => '["auth"]',
pw => $site_couchdb::couchdb_soledad_pw,
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 82f2befb..b73c23c3 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -9,6 +9,11 @@ class site_couchdb {
$couchdb_admin_pw = $couchdb_admin['password']
$couchdb_admin_salt = $couchdb_admin['salt']
+ $couchdb_leap_mx = $couchdb_users['leap_mx']
+ $couchdb_leap_mx_user = $couchdb_leap_mx['username']
+ $couchdb_leap_mx_pw = $couchdb_leap_mx['password']
+ $couchdb_leap_mx_salt = $couchdb_leap_mx['salt']
+
$couchdb_soledad = $couchdb_users['soledad']
$couchdb_soledad_user = $couchdb_soledad['username']
$couchdb_soledad_pw = $couchdb_soledad['password']