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

Reverting #2064 and Updating descriptions in backup and restore roles (#2060)

Browse Source 
* updating task descriptions in backup and restore roles

* Revert "Run import_auth_config_to_gateway when public_url is defined (#2064)"

This reverts commit 54293a0efb.
This commit is contained in:
aknochow
2025-07-29 19:21:38 -04:00
committed by GitHub
parent a55829e5d5
commit 45ce8185df
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/backup/tasks/postgres.yml
View File

@@ -72,7 +72,7 @@
command: >- command: >-
touch {{ backup_dir }}/tower.db touch {{ backup_dir }}/tower.db
- name: Set full resolvable host name for postgres pod - name: Set resolvable_db_host
set_fact: set_fact:
resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc", awx_postgres_host) }}' # yamllint disable-line rule:line-length resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc", awx_postgres_host) }}' # yamllint disable-line rule:line-length
no_log: "{{ no_log }}" no_log: "{{ no_log }}"

11
roles/installer/tasks/initialize_django.yml
View File

@@ -56,17 +56,6 @@
bash -c "awx-manage unregister_queue --queuename=tower" bash -c "awx-manage unregister_queue --queuename=tower"
when: "'[tower capacity=' in legacy_queue.stdout" when: "'[tower capacity=' in legacy_queue.stdout"
- name: Import auth config when public_url is defined and gating version is defined
kubernetes.core.k8s_exec:
namespace: "{{ ansible_operator_meta.namespace }}"
pod: "{{ awx_web_pod_name }}"
container: "{{ ansible_operator_meta.name }}-web"
command: >-
bash -c "awx-manage import_auth_config_to_gateway"
when:
- gating_version | length
- public_base_url is defined
- name: Check for specified default execution environment pull credentials - name: Check for specified default execution environment pull credentials
k8s_info: k8s_info:
kind: Secret kind: Secret

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

@@ -72,7 +72,7 @@
- "app.kubernetes.io/managed-by={{ deployment_type }}-operator" - "app.kubernetes.io/managed-by={{ deployment_type }}-operator"
register: old_postgres_svc register: old_postgres_svc
- name: Set full resolvable host name for postgres pod - name: Set resolvable_db_host
set_fact: set_fact:
resolvable_db_host: "{{ old_postgres_svc['resources'][0]['metadata']['name'] }}.{{ ansible_operator_meta.namespace }}.svc" # yamllint disable-line rule:line-length resolvable_db_host: "{{ old_postgres_svc['resources'][0]['metadata']['name'] }}.{{ ansible_operator_meta.namespace }}.svc" # yamllint disable-line rule:line-length
no_log: "{{ no_log }}" no_log: "{{ no_log }}"

4
roles/restore/tasks/postgres.yml
View File

@@ -67,7 +67,7 @@
- "{{ deployment_name }}-web" - "{{ deployment_name }}-web"
when: this_deployment['resources'] | length when: this_deployment['resources'] | length
- name: Set full resolvable host name for postgres pod - name: Set resolvable_db_host
set_fact: set_fact:
resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc." + cluster_name, awx_postgres_host) }}' # yamllint disable-line rule:line-length resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc." + cluster_name, awx_postgres_host) }}' # yamllint disable-line rule:line-length
no_log: "{{ no_log }}" no_log: "{{ no_log }}"
@@ -119,7 +119,7 @@
{{ pg_create_db }} {{ pg_create_db }}
when: force_drop_db when: force_drop_db
- name: Restore database dump to the new postgresql container - name: Restore Postgres database
kubernetes.core.k8s_exec: kubernetes.core.k8s_exec:
namespace: "{{ backup_pvc_namespace }}" namespace: "{{ backup_pvc_namespace }}"
pod: "{{ ansible_operator_meta.name }}-db-management" pod: "{{ ansible_operator_meta.name }}-db-management"