From e623c3d7cd997c9c12dd7306a9dafd49dde6065a Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 25 Apr 2018 11:17:26 -0400 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20hardcode=20Helm=20PostgreSQL=20?= =?UTF-8?q?deployment=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/roles/kubernetes/tasks/kubernetes.yml | 2 +- installer/roles/kubernetes/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/roles/kubernetes/tasks/kubernetes.yml b/installer/roles/kubernetes/tasks/kubernetes.yml index c2f222263a..14837e824c 100644 --- a/installer/roles/kubernetes/tasks/kubernetes.yml +++ b/installer/roles/kubernetes/tasks/kubernetes.yml @@ -12,5 +12,5 @@ - name: Set postgresql service name set_fact: - postgresql_service_name: "{{ kubernetes_namespace }}-postgresql" + postgresql_service_name: "{{ kubernetes_deployment_name }}-postgresql" when: "pg_hostname is not defined or pg_hostname == ''" diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 09ffc7fad8..da66f027f9 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -50,7 +50,7 @@ - name: Deploy and Activate Postgres (Kubernetes) shell: | - helm install --name awx --namespace {{ kubernetes_namespace }} \ + helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \ --set postgresUser={{ pg_username }} \ --set postgresPassword={{ pg_password }} \ --set postgresDatabase={{ pg_database }} \