summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-13 22:21:44 -0400
committerMicah Anderson <micah@leap.se>2013-08-14 10:10:50 -0400
commit3544497599bfd7902b7b1be6661aaf1048af44e3 (patch)
tree1a651138490f439f7c7ad1401e337be423de75d8 /puppet
parentabfea88ae96f9f4431a4e67866139258ef28a2b5 (diff)
require that the couchdb::query::setup has been run before any attempts are made to create databases or add users as these would fail otherwise. Closes: #3466
Change-Id: Ifa8b3da5858ce858fd319c4a659e70d20a65d3e0
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp5
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp16
2 files changed, 14 insertions, 7 deletions
diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
index 241a4914..97e85785 100644
--- a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
+++ b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
@@ -1,5 +1,8 @@
class site_couchdb::bigcouch::add_nodes {
# loop through neighbors array and add nodes
$nodes = $::site_couchdb::bigcouch_config['neighbors']
- couchdb::bigcouch::add_node { $nodes: }
+
+ couchdb::bigcouch::add_node { $nodes:
+ require => Couchdb::Query::Setup['localhost']
+ }
}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 802f3224..75ed87a0 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -59,23 +59,27 @@ class site_couchdb {
# Populate couchdb
couchdb::add_user { $couchdb_webapp_user:
- roles => '["auth"]',
- pw => $couchdb_webapp_pw,
- salt => $couchdb_webapp_salt
+ roles => '["auth"]',
+ pw => $couchdb_webapp_pw,
+ salt => $couchdb_webapp_salt,
+ require => Couchdb::Query::Setup['localhost']
}
couchdb::add_user { $couchdb_soledad_user:
roles => '["auth"]',
pw => $couchdb_soledad_pw,
- salt => $couchdb_soledad_salt
+ salt => $couchdb_soledad_salt,
+ require => Couchdb::Query::Setup['localhost']
}
couchdb::create_db { 'users':
- readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }"
+ readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
+ require => Couchdb::Query::Setup['localhost']
}
couchdb::create_db { 'tokens':
- readers => "{ \"names\": [], \"roles\": [\"auth\"] }"
+ readers => "{ \"names\": [], \"roles\": [\"auth\"] }",
+ require => Couchdb::Query::Setup['localhost']
}
include site_shorewall::couchdb