From b1e50fc76ddece9944ae253da9bacd485ffea84b Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 6 Oct 2015 13:23:56 +0200 Subject: [feat] Remove tapicero from more places Remove from: - platform white-box tests (couchdb user ACLs, tapicero daemon test) - provider_base/ dir that handles the compilation of the hiera config file - Resolves: #7501 --- provider_base/services/couchdb.json | 5 ----- 1 file changed, 5 deletions(-) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 8b1386f8..5e65b2ec 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -31,11 +31,6 @@ "password": "= secret :couch_soledad_password", "salt": "= hex_secret :couch_soledad_password_salt, 128" }, - "tapicero": { - "username": "tapicero", - "password": "= secret :couch_tapicero_password", - "salt": "= hex_secret :couch_tapicero_password_salt, 128" - }, "webapp": { "username": "webapp", "password": "= secret :couch_webapp_password", -- cgit v1.2.3 From da2c743faaccd26604c4c26fbb1557934688eb4a Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 1 Feb 2016 15:56:41 -0800 Subject: default to plain couchdb, unless otherwise specified. # Conflicts: # puppet/modules/site_couchdb/manifests/plain.pp --- provider_base/services/couchdb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 5e65b2ec..30cb53d1 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -8,8 +8,8 @@ } }, "couch": { - "master": false, "port": 5984, + "mode": "plain", "users": { "admin": { "username": "admin", -- cgit v1.2.3 From 8eec2d89983934868c9be07d55825cbe3bdcdaaf Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 2 Feb 2016 17:58:44 -0800 Subject: added templates for `leap node add`, so that new nodes can get default values set in their initial .json file. --- provider_base/services/couchdb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 30cb53d1..167bbf7d 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -9,7 +9,7 @@ }, "couch": { "port": 5984, - "mode": "plain", + "mode": "multimaster", "users": { "admin": { "username": "admin", -- cgit v1.2.3 From 89a3cd71f50a383a5f85510193087446da0e661f Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 26 Feb 2016 01:44:48 -0800 Subject: plain couchdb now required, bigcouch support disabled. --- provider_base/services/couchdb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 167bbf7d..30cb53d1 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -9,7 +9,7 @@ }, "couch": { "port": 5984, - "mode": "multimaster", + "mode": "plain", "users": { "admin": { "username": "admin", -- cgit v1.2.3