catalog-web hosts

ansible/inventories/bionic/group_vars/catalog-harvester/vars.yml

@@ -1,4 +1,6 @@
 ---
+catalog_app_type: worker
+
 datagov_service: catalog
 
 # project path

ansible/inventories/ci/group_vars/catalog-harvester/vars.yml

@@ -1,2 +1,4 @@
 ---
+catalog_app_type: worker
+
 datagov_service: catalog

ansible/inventories/production/group_vars/catalog-harvester/vars.yml

@@ -1,6 +1,7 @@
 ---
 datagov_service: catalog
 
+catalog_app_type: worker
 catalog_ckan_db_host: "{{ vault_catalog_ckan_db_host }}"
 catalog_ckan_db_name: "{{ vault_catalog_ckan_db_name }}"
 catalog_ckan_db_pass: "{{ vault_catalog_ckan_db_pass }}"
@@ -18,15 +19,10 @@ project_index_path: /usr/lib/ckan
 
 # db credentials
 ckan_db_server: "{{ vault_ckan_db_server }}"
-catalog_ckan_db_host: "{{ ckan_db_server }}"
 pycsw_db_server: "{{ vault_pycsw_db_server }}"
 catalog_db_user: "{{ vault_catalog_db_user }}"
 catalog_db_pass: "{{ vault_catalog_db_pass }}"
 catalog_db_name: "{{ vault_catalog_db_name }}"
-catalog_pycsw_db_name: "{{ vault_catalog_pycsw_db_name }}"
-catalog_pycsw_db_user: "{{ catalog_db_user }}"
-catalog_pycsw_db_host: "{{ catalog_db_server }}"
-catalog_pycsw_db_pass: "{{ catalog_db_pass }}"
 
 # other
 catalog_ckan_redis_host: catalog-harvester1p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/group_vars/catalog-web/vars.yml

@@ -15,7 +15,6 @@ project_index_path: /usr/lib/ckan
 
 # other
 catalog_ckan_redis_host: "localhost"
-catalog_ckan_solr_host: "{{ vault_solr_server }}"
 env: local
 redis_password: "{{ vault_redis_pass }}"
 

ansible/inventories/production/host_vars/catalog-web1p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -9,9 +9,9 @@ catalog_db_user: "{{ vault_catalog_db_user }}"
 catalog_db_pass: "{{ vault_catalog_db_pass }}"
 catalog_db_name: "{{ vault_catalog_db_name }}"
 catalog_pycsw_db_name: "{{ vault_catalog_pycsw_db_name }}"
-catalog_pycsw_db_user: "{{ catalog_db_user }}"
-catalog_pycsw_db_host: "{{ catalog_db_server }}"
-catalog_pycsw_db_pass: "{{ catalog_db_pass }}"
+catalog_pycsw_db_user: "{{ vault_catalog_pycsw_db_user }}"
+catalog_pycsw_db_host: "{{ vault_catalog_pycsw_db_host }}"
+catalog_pycsw_db_pass: "{{ vault_catalog_pycsw_db_pass }}"
 
 # other
 catalog_ckan_solr_host: datagovsolr1p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/host_vars/catalogb-web1p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -9,9 +9,9 @@ catalog_db_user: "{{ vault_catalog_db_user }}"
 catalog_db_pass: "{{ vault_catalog_db_pass }}"
 catalog_db_name: "{{ vault_catalog_db_name }}"
 catalog_pycsw_db_name: "{{ vault_catalog_pycsw_db_name }}"
-catalog_pycsw_db_user: "{{ catalog_db_user }}"
-catalog_pycsw_db_host: "{{ catalog_db_server }}"
-catalog_pycsw_db_pass: "{{ catalog_db_pass }}"
+catalog_pycsw_db_user: "{{ vault_catalog_pycsw_db_user }}"
+catalog_pycsw_db_host: "{{ vault_catalog_pycsw_db_host }}"
+catalog_pycsw_db_pass: "{{ vault_catalog_pycsw_db_pass }}"
 
 # other
 catalog_ckan_solr_host: datagovsolr2p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/host_vars/catalogbweb1p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -0,0 +1,2 @@
+---
+catalog_ckan_solr_host: datagovsolr2p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/host_vars/catalogbweb2p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -0,0 +1,2 @@
+---
+catalog_ckan_solr_host: datagovsolr2p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/host_vars/catalogweb1p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -0,0 +1,2 @@
+---
+catalog_ckan_solr_host: datagovsolr1p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/host_vars/catalogweb2p.prod-ocsit.bsp.gsa.gov/vars.yml

@@ -0,0 +1,2 @@
+---
+catalog_ckan_solr_host: datagovsolr1p.prod-ocsit.bsp.gsa.gov

ansible/inventories/production/hosts

@@ -19,6 +19,8 @@ catalogb-web[1:2]p.prod-ocsit.bsp.gsa.gov
 catalogpub-web1p.prod-ocsit.bsp.gsa.gov
 
 [catalog-web-v2]
+catalogweb[1:2]p.prod-ocsit.bsp.gsa.gov
+catalogbweb[1:2]p.prod-ocsit.bsp.gsa.gov
 
 [crm-web:children]
 crm-web-v1

ansible/inventories/staging/group_vars/catalog-harvester/vars.yml

@@ -1,6 +1,7 @@
 ---
 datagov_service: catalog
 
+catalog_app_type: worker
 catalog_ckan_db_host: "{{ vault_catalog_ckan_db_host }}"
 catalog_ckan_db_name: "{{ vault_catalog_ckan_db_name }}"
 catalog_ckan_db_pass: "{{ vault_catalog_ckan_db_pass }}"

ansible/inventories/staging/hosts

@@ -18,6 +18,7 @@ catalogpub-web1d.dev-ocsit.bsp.gsa.gov
 
 [catalog-web-v2]
 catalogweb[1:2]d.dev-ocsit.bsp.gsa.gov
+catalogpubweb1d.dev-ocsit.bsp.gsa.gov
 
 [crm-web:children]
 crm-web-v1

ansible/inventories/test/group_vars/catalog-harvester/vars.yml

@@ -1,6 +1,8 @@
 ---
 datagov_service: catalog
 
+catalog_app_type: worker
+
 # project path
 project_source_rollback_path: /usr/lib/ckan-rollback
 project_source_new_code_path: /usr/lib/ckan-new

ansible/roles/software/ckan/catalog/ckan-app/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
+catalog_app_type: web # either web or worker
 catalog_ckan_app_version: master
 catalog_ckan_python_home: /usr
 app_source_path: /tmp/catalog-app

ansible/roles/software/ckan/catalog/ckan-app/handlers/main.yml

@@ -1,3 +1,4 @@
 ---
 - name: reload apache2
   service: name=apache2 state=reloaded
+  when: catalog_app_type == "web"

ansible/roles/software/ckan/catalog/pycsw-app/handlers/main.yml

@@ -1,3 +1,4 @@
 ---
 - name: reload apache2
   service: name=apache2 state=reloaded
+  when: catalog_app_type == "web"

ansible/roles/software/ckan/fix-ckan-tracking/handlers/main.yml

@@ -1,3 +1,4 @@
 ---
 - name: reload apache2
   service: name=apache2 state=reloaded
+  when: catalog_app_type == "web"