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

related #2991 - unify postgresql_service_name

Browse Source 
Signed-off-by: Fabrice Flore-Thebault <themr0c@users.noreply.github.com>
This commit is contained in:
Fabrice Flore-Thebault
2019-01-15 11:44:08 +01:00
parent d43521bb77
commit ef3aab1357
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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,7 +80,7 @@
- name: Deploy and Activate Postgres (Kubernetes) - name: Deploy and Activate Postgres (Kubernetes)
shell: | shell: |
helm upgrade --install --name {{ kubernetes_namespace }}-{{ kubernetes_deployment_name }} \ helm upgrade --install --name {{ postgresql_service_name }} \
--namespace {{ kubernetes_namespace }} \ --namespace {{ kubernetes_namespace }} \
--set postgresqlUsername={{ pg_username }} \ --set postgresqlUsername={{ pg_username }} \
--set postgresqlPassword={{ pg_password }} \ --set postgresqlPassword={{ pg_password }} \
@@ -95,9 +95,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 }}"
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