[incubator-openwhisk] branch master updated: Fix bug on ansible variable db_prefix (#2594)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah 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 374c109  Fix bug on ansible variable db_prefix (#2594)
374c109 is described below

commit 374c10937e3a9b18869d713d7e0a69823e7590a2
Author: ningyougang <41...@qq.com>
AuthorDate: Thu Aug 10 10:36:01 2017 +0800

    Fix bug on ansible variable db_prefix (#2594)
---
 ansible/environments/distributed/group_vars/all    | 2 +-
 ansible/environments/docker-machine/group_vars/all | 2 +-
 ansible/environments/local/group_vars/all          | 2 +-
 ansible/environments/mac/group_vars/all            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/environments/distributed/group_vars/all b/ansible/environments/distributed/group_vars/all
index 7d30485..85f4405 100755
--- a/ansible/environments/distributed/group_vars/all
+++ b/ansible/environments/distributed/group_vars/all
@@ -5,7 +5,7 @@ db_protocol: http
 db_username: couch_user
 db_password: couch_password
 db_host: "{{ groups['db'] | first }}"
-db_prefix: "{{ ansible_user_id|lower }}_{{ ansible_hostname|lower }}_"
+db_prefix: whisk_distributed_
 
 whisk_version_name: local
 config_root_dir: /tmp
diff --git a/ansible/environments/docker-machine/group_vars/all b/ansible/environments/docker-machine/group_vars/all
index 1ce7bb2..5628a1f 100644
--- a/ansible/environments/docker-machine/group_vars/all
+++ b/ansible/environments/docker-machine/group_vars/all
@@ -10,7 +10,7 @@ docker_dns: ""
 whisk_api_localhost_name: "openwhisk"
 
 # Hardcoded for docker-machine since db init runs on host not inside VM
-db_prefix: dockermachine_
+db_prefix: whisk_dockermachine_
 
 # Auto lookup to find the db credentials
 db_provider: "{{ lookup('ini', 'db_provider section=db_creds file={{ playbook_dir }}/db_local.ini') }}"
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index d1718ce..22b23c4 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -4,7 +4,7 @@ whisk_logs_dir: /tmp/wsklogs
 docker_registry: ""
 docker_dns: ""
 
-db_prefix: "{{ ansible_user_id|lower }}_{{ ansible_hostname|lower }}_"
+db_prefix: whisk_local_
 
 # Auto lookup to find the db credentials
 db_provider: "{{ lookup('ini', 'db_provider section=db_creds file={{ playbook_dir }}/db_local.ini') }}"
diff --git a/ansible/environments/mac/group_vars/all b/ansible/environments/mac/group_vars/all
index a30a0bc..bd09410 100755
--- a/ansible/environments/mac/group_vars/all
+++ b/ansible/environments/mac/group_vars/all
@@ -4,7 +4,7 @@ whisk_logs_dir: /Users/Shared/wsklogs
 docker_registry: ""
 docker_dns: ""
 
-db_prefix: "{{ ansible_user_id|lower }}_{{ ansible_hostname|lower }}_"
+db_prefix: whisk_mac_
 
 # Auto lookup to find the db credentials
 db_provider: "{{ lookup('ini', 'db_provider section=db_creds file={{ playbook_dir }}/db_local.ini') }}"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].