WAC-42 Default to datapusher not being used (#9)

fjelltopp · May 14, 2024 · 12f090b · 12f090b
1 parent c8a690c
commit 12f090b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml
@@ -60,6 +60,7 @@ ckan_db_image: "ckan/postgresql"
 # ```python -c 'import secrets; print(secrets.token_urlsafe(20)[:25])'```
 # ckan_beaker_secret: "IYe9lQOkeogHJrB8PWU17fK4_"
 # ckan_api_secret: "cuu4ohph2PohDei3ae2xahJ3pohwoofonoar7eim9deem7au2ge1ieKej5Mai0Ea"
+ckan_datapusher_enable: false
 ckan_datapusher_url: "http://datapusher:8800"
 ckan_datastore_read_url: "postgresql://datastore_ro:{{ ckan_ds_ro_pass }}@db/datastore"
 ckan_datastore_write_url: "postgresql://ckan:{{ ckan_postgres_password }}@db/datastore"

diff --git a/roles/ckan/tasks/deploy.yml b/roles/ckan/tasks/deploy.yml
@@ -81,7 +81,7 @@
     login_host: "{{ ckan_fqdn }}"
     login_user: "{{ rds_admin_username }}"
     login_password: "{{ ckan_postgres_password }}"
-  when: fjelltopp_env_type == 'local'
+  when: (fjelltopp_env_type == 'local') and (ckan_datapusher_enable)
   register: db_ping_result
   retries: 10
   delay: 5
@@ -106,6 +106,7 @@
   become: false
   with_items:
     - ckandb_job.yaml
+  when: fjelltopp_env_type != 'local'
 
 - name: Deploy CKAN
   kubernetes.core.k8s: