diff options
author | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
commit | 32a0f9df6e80c15b3b49b8ad81b9a49ecc6f39dd (patch) | |
tree | 7d180ca7bf135523969956ed468b6224ff44ece8 /manifests/bigcouch | |
parent | 61eca267cb52252371a71926a64d7f3b7350489d (diff) | |
parent | 321d463b43dc44a4f313aa6dabef1a8bdce27122 (diff) |
Merge branch 'master' of ssh://code.leap.se/puppet_couchdb
Conflicts:
manifests/create_db.pp
Diffstat (limited to 'manifests/bigcouch')
-rw-r--r-- | manifests/bigcouch/add_node.pp | 7 | ||||
-rw-r--r-- | manifests/bigcouch/document.pp | 9 | ||||
-rw-r--r-- | manifests/bigcouch/query.pp | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/manifests/bigcouch/add_node.pp b/manifests/bigcouch/add_node.pp index da10db2..ed9db94 100644 --- a/manifests/bigcouch/add_node.pp +++ b/manifests/bigcouch/add_node.pp @@ -1,7 +1,8 @@ define couchdb::bigcouch::add_node { - couchdb::bigcouch::query { "add_${name}": - cmd => 'PUT', - url => "nodes/bigcouch@${name}" + couchdb::bigcouch::document { "add_${name}": + db => 'nodes', + id => "bigcouch@${name}", + ensure => 'present' } } diff --git a/manifests/bigcouch/document.pp b/manifests/bigcouch/document.pp new file mode 100644 index 0000000..f72f205 --- /dev/null +++ b/manifests/bigcouch/document.pp @@ -0,0 +1,9 @@ +define couchdb::bigcouch::document ( $host='127.0.0.1:5986', $db, $id, $data='{}', $ensure='content') { + couchdb::document { "${name}": + host => $host, + db => $db, + id => $id, + data => $data, + ensure => $ensure + } +} diff --git a/manifests/bigcouch/query.pp b/manifests/bigcouch/query.pp deleted file mode 100644 index cecfe5a..0000000 --- a/manifests/bigcouch/query.pp +++ /dev/null @@ -1,10 +0,0 @@ -define couchdb::bigcouch::query ( - $cmd, $url, $host='127.0.0.1:5986', $data = '{}' ) { - - couchdb::query { "${name}": - cmd => $cmd, - host => $host, - url => $url, - data => $data - } -} |