dubee closed pull request #3893: Always create users-database in couchdb,
independently from the amoun…
URL: https://github.com/apache/incubator-openwhisk/pull/3893
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/roles/couchdb/tasks/deploy.yml
b/ansible/roles/couchdb/tasks/deploy.yml
index 2e3b75d591..628257a183 100644
--- a/ansible/roles/couchdb/tasks/deploy.yml
+++ b/ansible/roles/couchdb/tasks/deploy.yml
@@ -59,7 +59,7 @@
user: "{{ db.credentials.admin.user }}"
password: "{{ db.credentials.admin.pass }}"
force_basic_auth: yes
- when: (couchdb.version|version_compare('2.0','>=')) and (db.instances|int ==
1)
+ when: (inventory_hostname == coordinator) and
(couchdb.version|version_compare('2.0','>='))
- name: enable the cluster setup mode
uri:
diff --git a/ansible/tasks/db/grantPermissions.yml
b/ansible/tasks/db/grantPermissions.yml
index 11c7f11f56..6ac1b77f76 100644
--- a/ansible/tasks/db/grantPermissions.yml
+++ b/ansible/tasks/db/grantPermissions.yml
@@ -23,7 +23,7 @@
body: |
{
"admins": {
- "names": [ {{ adminList | join('", "') }} ],
+ "names": [ "{{ adminList | join('", "') }}" ],
"roles": []
},
"members": {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
