External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2999 from themr0c/issue-2991

Browse Source 
related #2991 - Helm creation of postgreql on multiple namespaces

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-01-17 14:28:05 +00:00
committed by GitHub
parent 3eaed52b83 c434d38876
commit 474876872e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,13 +53,13 @@
- name: Deploy PostgreSQL (OpenShift) - name: Deploy PostgreSQL (OpenShift)
block: block:
- name: Template PostgreSQL Deployment - name: Template PostgreSQL Deployment (OpenShift)
template: template:
src: postgresql-persistent.yml.j2 src: postgresql-persistent.yml.j2
dest: "{{ kubernetes_base_path }}/postgresql-persistent.yml" dest: "{{ kubernetes_base_path }}/postgresql-persistent.yml"
mode: '0600' mode: '0600'
- name: Deploy and Activate Postgres - name: Deploy and Activate Postgres (OpenShift)
shell: | shell: |
{{ openshift_oc_bin }} new-app --file={{ kubernetes_base_path }}/postgresql-persistent.yml \ {{ openshift_oc_bin }} new-app --file={{ kubernetes_base_path }}/postgresql-persistent.yml \
-e MEMORY_LIMIT={{ pg_memory_limit|default('512') }}Mi \ -e MEMORY_LIMIT={{ pg_memory_limit|default('512') }}Mi \
@@ -80,11 +80,14 @@
- name: Deploy and Activate Postgres (Kubernetes) - name: Deploy and Activate Postgres (Kubernetes)
shell: | shell: |
helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \ helm repo update --tiller-namespace={{ tiller_namespace | default('kube-system') }}
helm upgrade {{ postgresql_service_name }} --install \
--namespace {{ kubernetes_namespace }} \
--set postgresqlUsername={{ pg_username }} \ --set postgresqlUsername={{ pg_username }} \
--set postgresqlPassword={{ pg_password }} \ --set postgresqlPassword={{ pg_password }} \
--set postgresqlDatabase={{ pg_database }} \ --set postgresqlDatabase={{ pg_database }} \
--set persistence.size={{ pg_volume_capacity|default('5')}}Gi \ --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \
--version="2.0.0" \
--tiller-namespace={{ tiller_namespace | default('kube-system') }} \ --tiller-namespace={{ tiller_namespace | default('kube-system') }} \
stable/postgresql stable/postgresql
when: when:
@@ -94,9 +97,9 @@
register: kubernetes_pg_activate register: kubernetes_pg_activate
no_log: yes no_log: yes
- name: Set postgresql hostname to helm package service - name: Set postgresql hostname to helm package service (Kubernetes)
set_fact: set_fact:
pg_hostname: "{{ kubernetes_deployment_name }}-postgresql" pg_hostname: "{{ postgresql_service_name }}-postgresql"
when: when:
- pg_hostname is not defined or pg_hostname == '' - pg_hostname is not defined or pg_hostname == ''
- kubernetes_context is defined - kubernetes_context is defined