Skip to content

Commit 2977e3d

Browse files
committed
Add the conf dir for CouchDB.
1 parent ec3e97f commit 2977e3d

File tree

7 files changed

+8
-0
lines changed

7 files changed

+8
-0
lines changed

ansible/environments/docker-machine/group_vars/all

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ whisk_api_localhost_name: "openwhisk"
3232

3333
# Hardcoded for docker-machine since db init runs on host not inside VM
3434
db_prefix: whisk_dockermachine_
35+
db_confdir: "{{ config_root_dir }}/couchdb"
3536

3637
# API GW connection configuration
3738
apigw_auth_user: ""

ansible/environments/jenkins/group_vars/openwhisk-vm1-he-de

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
2626
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
2727

2828
db_prefix: whisk_local_
29+
db_confdir: "{{ config_root_dir }}/couchdb"
2930

3031
# API GW connection configuration
3132
apigw_auth_user: ""

ansible/environments/jenkins/group_vars/openwhisk-vm2-he-de

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
2626
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
2727

2828
db_prefix: whisk_local_
29+
db_confdir: "{{ config_root_dir }}/couchdb"
2930

3031
# API GW connection configuration
3132
apigw_auth_user: ""

ansible/environments/jenkins/group_vars/openwhisk-vm3-he-de

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
2626
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
2727

2828
db_prefix: whisk_local_
29+
db_confdir: "{{ config_root_dir }}/couchdb"
2930

3031
# API GW connection configuration
3132
apigw_auth_user: ""

ansible/environments/local/group_vars/all

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
2626
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
2727

2828
db_prefix: whisk_local_
29+
db_confdir: "{{ config_root_dir }}/couchdb"
2930

3031
# API GW connection configuration
3132
apigw_auth_user: ""

ansible/environments/vagrant/group_vars/all

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ runtimes_bypass_pull_for_local_images: true
2424
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
2525

2626
db_prefix: whisk_local_
27+
db_confdir: "{{ config_root_dir }}/couchdb"
2728

2829
# API GW connection configuration
2930
apigw_auth_user: ""

ansible/group_vars/all

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ db:
271271
port: "{{ db_port | default(lookup('ini', 'db_port section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
272272
host: "{{ db_host | default(lookup('ini', 'db_host section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
273273
persist_path: "{{ db_persist_path | default(false) }}"
274+
dir:
275+
become: "{{ db_dir_become | default(true) }}"
274276
instances: "{{ groups['db'] | length }}"
275277
authkeys:
276278
- guest

0 commit comments

Comments
 (0)