internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not shadow other variables

Browse Source
This commit is contained in:
Yanis Guenane
2021-05-25 15:25:03 +02:00
parent 75458d0678
commit 223fe988aa
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/installer/tasks/admin_password_configuration.yml
View File

@@ -35,8 +35,8 @@
- name: Set admin password secret - name: Set admin password secret
set_fact: set_fact:
admin_password_secret: '{{ _generated_admin_password["resources"] | default([]) | length | ternary(_generated_admin_password, _admin_password_secret) }}' __admin_password_secret: '{{ _generated_admin_password["resources"] | default([]) | length | ternary(_generated_admin_password, _admin_password_secret) }}'
- name: Store admin password - name: Store admin password
set_fact: set_fact:
admin_password: "{{ admin_password_secret['resources'][0]['data']['password'] | b64decode }}" admin_password: "{{ __admin_password_secret['resources'][0]['data']['password'] | b64decode }}"

4
roles/installer/tasks/broadcast_websocket_configuration.yml
View File

@@ -37,8 +37,8 @@
- name: Set broadcast websocket secret - name: Set broadcast websocket secret
set_fact: set_fact:
# yamllint disable-line rule:line-length # yamllint disable-line rule:line-length
broadcast_websocket_secret: '{{ _generated_broadcast_websocket["resources"] | default([]) | length | ternary(_generated_broadcast_websocket, _broadcast_websocket_secret) }}' # noqa 204 __broadcast_websocket_secret: '{{ _generated_broadcast_websocket["resources"] | default([]) | length | ternary(_generated_broadcast_websocket, _broadcast_websocket_secret) }}' # noqa 204
- name: Store broadcast websocket secret name - name: Store broadcast websocket secret name
set_fact: set_fact:
broadcast_websocket_secret_value: "{{ broadcast_websocket_secret['resources'][0]['data']['secret'] | b64decode }}" broadcast_websocket_secret_value: "{{ __broadcast_websocket_secret['resources'][0]['data']['secret'] | b64decode }}"

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

@@ -66,7 +66,7 @@
- name: Set actual postgres configuration secret used - name: Set actual postgres configuration secret used
set_fact: set_fact:
postgres_configuration_secret: "{{ pg_config['resources'][0]['metadata']['name'] }}" __postgres_configuration_secret: "{{ pg_config['resources'][0]['metadata']['name'] }}"
- block: - block:
- name: Create Database if no database is specified - name: Create Database if no database is specified

4
roles/installer/tasks/secret_key_configuration.yml
View File

@@ -35,8 +35,8 @@
- name: Set secret key secret - name: Set secret key secret
set_fact: set_fact:
secret_key_secret: '{{ _generated_secret_key["resources"] | default([]) | length | ternary(_generated_secret_key, _secret_key_secret) }}' __secret_key_secret: '{{ _generated_secret_key["resources"] | default([]) | length | ternary(_generated_secret_key, _secret_key_secret) }}'
- name: Store secret key secret name - name: Store secret key secret name
set_fact: set_fact:
secret_key_secret_name: "{{ secret_key_secret['resources'][0]['metadata']['name'] }}" secret_key_secret_name: "{{ __secret_key_secret['resources'][0]['metadata']['name'] }}"

4
roles/installer/tasks/update_status.yml
View File

@@ -6,7 +6,7 @@
name: "{{ meta.name }}" name: "{{ meta.name }}"
namespace: "{{ meta.namespace }}" namespace: "{{ meta.namespace }}"
status: status:
adminPasswordSecret: "{{ admin_password_secret['resources'][0]['metadata']['name'] }}" adminPasswordSecret: "{{ __admin_password_secret['resources'][0]['metadata']['name'] }}"
- name: Update admin user status - name: Update admin user status
operator_sdk.util.k8s_status: operator_sdk.util.k8s_status:
@@ -33,7 +33,7 @@
name: "{{ meta.name }}" name: "{{ meta.name }}"
namespace: "{{ meta.namespace }}" namespace: "{{ meta.namespace }}"
status: status:
broadcastWebsocketSecret: "{{ broadcast_websocket_secret['resources'][0]['metadata']['name'] }}" broadcastWebsocketSecret: "{{ __broadcast_websocket_secret['resources'][0]['metadata']['name'] }}"
- name: Update secret key status - name: Update secret key status
operator_sdk.util.k8s_status: operator_sdk.util.k8s_status:

12
roles/installer/templates/postgres.yaml.j2
View File

@@ -42,34 +42,34 @@ spec:
- name: POSTGRESQL_DATABASE - name: POSTGRESQL_DATABASE
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: database key: database
- name: POSTGRESQL_USER - name: POSTGRESQL_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: username key: username
- name: POSTGRESQL_PASSWORD - name: POSTGRESQL_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: password key: password
# For postgres_image based on postgres # For postgres_image based on postgres
- name: POSTGRES_DB - name: POSTGRES_DB
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: database key: database
- name: POSTGRES_USER - name: POSTGRES_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: username key: username
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: '{{ postgres_configuration_secret }}' name: '{{ __postgres_configuration_secret }}'
key: password key: password
- name: PGDATA - name: PGDATA
value: '{{ postgres_data_path }}' value: '{{ postgres_data_path }}'