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

Added support to override pg_sslmode

Browse Source
This commit is contained in:
Marcelo Moreira de Mello
2021-04-11 21:56:57 -04:00
parent 9503d3cf48
commit 298d39c57b
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -207,9 +207,12 @@ stringData:
database: <desired database name> database: <desired database name>
username: <username to connect as> username: <username to connect as>
password: <password to connect with> password: <password to connect with>
sslmode: prefer
type: Opaque type: Opaque
``` ```
**Note**: The variable `sslmode` is valid for `external` databases only. The allowed values are: `prefer`, `disable`, `allow`, `require`, `verify-ca`, `verify-full`.
#### Migrating data from an old AWX instance #### Migrating data from an old AWX instance
For instructions on how to migrate from an older version of AWX, see [migration.md](./docs/migration.md). For instructions on how to migrate from an older version of AWX, see [migration.md](./docs/migration.md).

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

@@ -78,6 +78,7 @@
awx_postgres_database: "{{ pg_config['resources'][0]['data']['database'] | b64decode }}" awx_postgres_database: "{{ pg_config['resources'][0]['data']['database'] | b64decode }}"
awx_postgres_port: "{{ pg_config['resources'][0]['data']['port'] | b64decode }}" awx_postgres_port: "{{ pg_config['resources'][0]['data']['port'] | b64decode }}"
awx_postgres_host: "{{ pg_config['resources'][0]['data']['host'] | b64decode }}" awx_postgres_host: "{{ pg_config['resources'][0]['data']['host'] | b64decode }}"
awx_postgres_sslmode: "{{ pg_config['resources'][0]['data']['sslmode'] | default('prefer'|b64encode) | b64decode }}"
- name: Look up details for this deployment - name: Look up details for this deployment
k8s_info: k8s_info:

2
roles/installer/templates/credentials.py.j2
View File

@@ -7,7 +7,7 @@ DATABASES = {
'PASSWORD': "{{ awx_postgres_pass | quote }}", 'PASSWORD': "{{ awx_postgres_pass | quote }}",
'HOST': '{{ awx_postgres_host }}', 'HOST': '{{ awx_postgres_host }}',
'PORT': "{{ awx_postgres_port }}", 'PORT': "{{ awx_postgres_port }}",
'OPTIONS': { 'sslmode': '{{ pg_sslmode|default("prefer") }}', 'OPTIONS': { 'sslmode': '{{ awx_postgres_sslmode }}',
'sslrootcert': '{{ ca_trust_bundle }}', 'sslrootcert': '{{ ca_trust_bundle }}',
}, },
} }