External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 16:28:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1799 from shanemcd/devel

Browse Source 
Fix Helm PostgreSQL deployment name
This commit is contained in:
Shane McDonald
2018-04-25 11:22:39 -04:00
committed by GitHub
parent d04bbde3c2 e5faf0798f
commit 5313e069ca
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/kubernetes/tasks/kubernetes.yml
View File

@@ -12,5 +12,5 @@
- name: Set postgresql service name - name: Set postgresql service name
set_fact: set_fact:
postgresql_service_name: "{{ kubernetes_namespace }}-postgresql" postgresql_service_name: "{{ kubernetes_deployment_name }}-postgresql"
when: "pg_hostname is not defined or pg_hostname == ''" when: "pg_hostname is not defined or pg_hostname == ''"

2
installer/roles/kubernetes/tasks/main.yml
View File

@@ -50,7 +50,7 @@
- name: Deploy and Activate Postgres (Kubernetes) - name: Deploy and Activate Postgres (Kubernetes)
shell: | shell: |
helm install --name awx --namespace {{ kubernetes_namespace }} \ helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \
--set postgresUser={{ pg_username }} \ --set postgresUser={{ pg_username }} \
--set postgresPassword={{ pg_password }} \ --set postgresPassword={{ pg_password }} \
--set postgresDatabase={{ pg_database }} \ --set postgresDatabase={{ pg_database }} \

1
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -213,6 +213,7 @@ spec:
cpu: "{{ rabbitmq_cpu_request }}m" cpu: "{{ rabbitmq_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-memcached - name: {{ kubernetes_deployment_name }}-memcached
image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}" image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
imagePullPolicy: Always
resources: resources:
requests: requests:
memory: "{{ memcached_mem_request }}Gi" memory: "{{ memcached_mem_request }}Gi"