Update Airflow Celery 'result_backend'

The current settings in Airflow is different from the recommended
one in [0]

This patch set is meant to align with the recommended configurations

Note also that due to issue reported in [1], we are keeping the
variable 'celery_result_backend' for now and will remove it when
we upgrade airflow to Airflow v1.9.1

[0] http://docs.celeryproject.org/en/latest/userguide/configuration.html
[1] https://github.com/puckel/docker-airflow/issues/156

Change-Id: Ibead7c2ca76a984c09327579aedade036b959ab2

charts/shipyard/templates/configmap-airflow-etc.yaml

@@ -31,7 +31,11 @@
 {{- end -}}
 
 {{- if empty .Values.conf.airflow.celery.result_backend -}}
-{{- tuple "postgresql_airflow_db" "internal" "user" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.airflow.celery "result_backend" | quote | trunc 0 -}}
+{{- tuple "postgresql_airflow_celery_db" "internal" "user" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.airflow.celery "result_backend" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.conf.airflow.celery.celery_result_backend -}}
+{{- tuple "postgresql_airflow_celery_db" "internal" "user" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.airflow.celery "celery_result_backend" | quote | trunc 0 -}}
 {{- end -}}
 
 # Add endpoint URI lookup for RabbitMQ Connection

charts/shipyard/templates/etc/_airflow.cfg.tpl

@@ -319,6 +319,7 @@
 # The use of a database is highly recommended
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-result-backend-settings
 {{ if not .celery.result_backend }}#{{ end }}result_backend = {{ .celery.result_backend | default "<None>" }}
+{{ if not .celery.celery_result_backend }}#{{ end }}celery_result_backend = {{ .celery.celery_result_backend | default "<None>" }}
 
 # Celery Flower is a sweet UI for Celery. Airflow has a shortcut to start
 # it `airflow flower`. This defines the IP that Celery Flower runs on

charts/shipyard/values.yaml

@@ -265,6 +265,25 @@ endpoints:
         default: 5432
     host_fqdn_override:
       default: null
+  postgresql_airflow_celery_db:
+    name: postgresql_airflow_celery_db
+    auth:
+      admin:
+        username: postgres
+        password: password
+      user:
+        username: airflow
+        password: password
+        database: airflow
+    hosts:
+      default: postgresql
+    path: /airflow
+    scheme: db+postgresql
+    port:
+      postgresql:
+        default: 5432
+    host_fqdn_override:
+      default: null
   oslo_messaging:
     auth:
       user: