openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dube...@apache.org
Subject [incubator-openwhisk] branch master updated: Always create users-database in couchdb, independently from the amoun… (#3893)
Date Mon, 23 Jul 2018 16:13:22 GMT
This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 89fe2fe  Always create users-database in couchdb, independently from the amoun…
(#3893)
89fe2fe is described below

commit 89fe2fe05f16a59003ef3ef43dc122400f014357
Author: Christian Bickel <github@cbickel.de>
AuthorDate: Mon Jul 23 18:13:18 2018 +0200

    Always create users-database in couchdb, independently from the amoun… (#3893)
    
    * Always create users-database in couchdb, independently from the amount of instances.
    
    * Add quotes to the admin list on granting permissions.
---
 ansible/roles/couchdb/tasks/deploy.yml | 2 +-
 ansible/tasks/db/grantPermissions.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/couchdb/tasks/deploy.yml b/ansible/roles/couchdb/tasks/deploy.yml
index 2e3b75d..628257a 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 11c7f11..6ac1b77 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": {


Mime
View raw message