WAC-42: Improve datapusher deployment. (#11)

* WAC-42: Improve datapusher deployment.

* Run "Unit CKAN schema" locally when datapusher is enabled.

* WAC-42 Add psycopg2 to the pipenv

* WAC-42 Improve check for DB availability

* WAC-42 Set datastore permission during db bootstrap

---------

Co-authored-by: Jonathan S Berry <[email protected]>

.gitignore

@@ -0,0 +1,2 @@
+roles/gantsign.minikube
+roles/geerlingguy.helm

Pipfile

@@ -16,6 +16,7 @@ botocore = "*"
 openshift = "*"
 docker = "*"
 awscli = "*"
+psycopg2 = "*"
 
 [requires]
 python_version = "3.8"

roles/ckan/tasks/deploy.yml

@@ -81,12 +81,13 @@
     login_host: "{{ ckan_fqdn }}"
     login_user: "{{ rds_admin_username }}"
     login_password: "{{ ckan_postgres_password }}"
-  when: (fjelltopp_env_type == 'local') and (ckan_datapusher_enable)
+  when: (fjelltopp_env_type == 'local')
   register: db_ping_result
   retries: 10
   delay: 5
-  until: db_ping_result.is_available
-  failed_when: not db_ping_result.is_available
+  until: db_ping_result is defined and db_ping_result.get('is_available')
+  failed_when: db_ping_result is not defined or not db_ping_result.is_available
+  # For this check to work psycopg2 must be installed for the venv python referenced from your inventory
 
 - name: Setup database parameters
   set_fact:
@@ -106,7 +107,7 @@
   become: false
   with_items:
     - ckandb_job.yaml
-  when: fjelltopp_env_type != 'local'
+  when: (fjelltopp_env_type != 'local') or (ckan_datapusher_enable == 'true')
 
 - name: Deploy CKAN
   kubernetes.core.k8s:

roles/ckan/templates/ckan/ckan_bootstrap.sh

@@ -12,6 +12,6 @@ echo "Create API token:"
 psql "${CKAN_SQLALCHEMY_URL}"  -c "INSERT INTO api_token VALUES ('{{ ckan_default_api_token }}', 'Default Token', '{{ ckan_admin_user_id }}', now()) ON CONFLICT DO NOTHING;"
 echo "make admin superuser"
 ckan -c "$CONFIG" sysadmin add admin
+echo "Set datastore permissions"
+ckan -c "$CONFIG" datastore set-permissions | psql "${CKAN_SQLALCHEMY_URL}"
 echo bootstrap finished
-
-

roles/ckan/templates/ckan/ckan_production.ini

@@ -195,6 +195,7 @@ ckan.datapusher.url = {{ ckan_datapusher_url }}
 {% if ckan_datapusher_api_token %}
 ckan.datapusher.api_token = {{ ckan_datapusher_api_token }}
 {% endif %}
+ckan.datapusher.callback_url_base = http://ckan:5000/
 ckan.datapusher.assume_task_stale_after = 3600
 {% endif %}
 

roles/requirements.yml

@@ -21,4 +21,4 @@ collections:
   version: 2.10.0
 - name: community.postgresql
   accept_hostkey: true
-  version: 3.4.0
+  version: 3.4.1