Rename db.backend to db.artifact_store.backend

Author: jiangpengcheng

ansible/README.md

@@ -215,7 +215,7 @@ cd <openwhisk_home>
 cd ansible
 ansible-playbook -i environments/<environment> initMongodb.yml -e mongodb_connect_string="mongodb://172.17.0.1:27017"
 ansible-playbook -i environments/<environment> apigateway.yml -e mongodb_connect_string="mongodb://172.17.0.1:27017"
-ansible-playbook -i environments/<environment> openwhisk.yml -e mongodb_connect_string="mongodb://172.17.0.1:27017" -e database_backend="MongoDB"
+ansible-playbook -i environments/<environment> openwhisk.yml -e mongodb_connect_string="mongodb://172.17.0.1:27017" -e db_artifact_backend="MongoDB"
 
 # installs a catalog of public packages and actions
 ansible-playbook -i environments/<environment> postdeploy.yml

ansible/group_vars/all

@@ -256,7 +256,6 @@ db:
   port: "{{ db_port | default(lookup('ini', 'db_port section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
   host: "{{ db_host | default(lookup('ini', 'db_host section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
   persist_path: "{{ db_persist_path | default(false) }}"
-  backend: "{{ database_backend | default('CouchDB') }}"
   instances: "{{ groups['db'] | length }}"
   authkeys:
   - guest
@@ -275,6 +274,8 @@ db:
     invoker:
       user: "{{ db_invoker_user | default(lookup('ini', 'db_username section=invoker file={{ playbook_dir }}/db_local.ini')) }}"
       pass: "{{ db_invoker_pass | default(lookup('ini', 'db_password section=invoker file={{ playbook_dir }}/db_local.ini')) }}"
+  artifact_store:
+    backend: "{{ db_artifact_backend | default('CouchDB') }}"
   activation_store:
     backend: "{{ db_activation_backend | default('CouchDB') }}"
   elasticsearch:

ansible/roles/controller/tasks/deploy.yml

@@ -298,12 +298,12 @@
       "CONFIG_whisk_mongodb_uri": "{{ db.mongodb.connect_string }}"
       "CONFIG_whisk_mongodb_database": "{{ db.mongodb.database }}"
       "CONFIG_whisk_spi_ArtifactStoreProvider": "org.apache.openwhisk.core.database.mongodb.MongoDBArtifactStoreProvider"
-  when: db.backend == "MongoDB"
+  when: db.artifact_store.backend == "MongoDB"
 
 - name: merge mongodb artifact store env
   set_fact:
     env: "{{ env | combine(mongodb_env) }}"
-  when: db.backend == "MongoDB"
+  when: db.artifact_store.backend == "MongoDB"
 
 - name: populate volumes for controller
   set_fact:

ansible/roles/invoker/tasks/deploy.yml

@@ -313,12 +313,12 @@
       "CONFIG_whisk_mongodb_uri": "{{ db.mongodb.connect_string }}"
       "CONFIG_whisk_mongodb_database": "{{ db.mongodb.database }}"
       "CONFIG_whisk_spi_ArtifactStoreProvider": "org.apache.openwhisk.core.database.mongodb.MongoDBArtifactStoreProvider"
-  when: db.backend == "MongoDB"
+  when: db.artifact_store.backend == "MongoDB"
 
 - name: merge mongodb artifact store env
   set_fact:
     env: "{{ env | combine(mongodb_env) }}"
-  when: db.backend == "MongoDB"
+  when: db.artifact_store.backend == "MongoDB"
 
 - name: include plugins
   include_tasks: "{{ inv_item }}.yml"

ansible/tasks/db/checkDb.yml

@@ -28,7 +28,7 @@
     user: "{{ dbUser }}"
     password: "{{ dbPass }}"
     force_basic_auth: yes
-  when: db.backend == "CouchDB"
+  when: db.artifact_store.backend == "CouchDB"
 
 # the collection in MongoDB doesn't need to be created in advance, so just skip it
 # - name: check if {{ dbName }} on MongoDB exists

ansible/templates/whisk.conf.j2

@@ -14,7 +14,7 @@ whisk {
       WhiskActivation = "{{ db.whisk.activations }}"
     }
   }
-  {% if db.backend == 'MongoDB' %}
+  {% if db.artifact_store.backend == 'MongoDB' %}
   mongodb {
     uri         = "{{ db.mongodb.connect_string }}"
     database    = "{{ db.mongodb.database }}"