internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-06 13:22:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from Spredzy/fix_creds

Browse Source 
tower_config: Remove credential from tower_config.yml
This commit is contained in:
Yanis Guenane
2021-02-08 09:48:58 +01:00
committed by GitHub
parent c5cd12e662 357e8ad2c9
commit 5efd45570e
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ DATABASES = {
'ENGINE': 'awx.main.db.profiled_pg', 'ENGINE': 'awx.main.db.profiled_pg',
'NAME': "{{ awx_postgres_database }}", 'NAME': "{{ awx_postgres_database }}",
'USER': "{{ awx_postgres_user }}", 'USER': "{{ awx_postgres_user }}",
'PASSWORD': "{{ awx_postgres_pass }}", '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': '{{ pg_sslmode|default("prefer") }}',

2
roles/installer/templates/environment.sh.j2
View File

@@ -2,4 +2,4 @@ DATABASE_USER={{ awx_postgres_user }}
DATABASE_NAME={{ awx_postgres_database }} DATABASE_NAME={{ awx_postgres_database }}
DATABASE_HOST={{ awx_postgres_host }} DATABASE_HOST={{ awx_postgres_host }}
DATABASE_PORT={{ awx_postgres_port }} DATABASE_PORT={{ awx_postgres_port }}
DATABASE_PASSWORD={{ awx_postgres_pass }} DATABASE_PASSWORD={{ awx_postgres_pass | quote }}

22
roles/installer/templates/tower_config.yaml.j2
View File

@@ -9,11 +9,6 @@ metadata:
app: '{{ deployment_type }}' app: '{{ deployment_type }}'
data: data:
environment: | environment: |
DATABASE_USER=awx
DATABASE_NAME=awx
DATABASE_HOST='{{ meta.name }}-postgres.{{ meta.namespace }}.svc.cluster.local'
DATABASE_PORT='5432'
DATABASE_PASSWORD={{ awx_postgres_pass | quote }}
AWX_SKIP_MIGRATIONS=true AWX_SKIP_MIGRATIONS=true
settings: | settings: |
@@ -83,22 +78,7 @@ data:
LOGGING['handlers']['rbac_migrations'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['rbac_migrations'] = {'class': 'logging.NullHandler'}
LOGGING['handlers']['system_tracking_migrations'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['system_tracking_migrations'] = {'class': 'logging.NullHandler'}
LOGGING['handlers']['management_playbooks'] = {'class': 'logging.NullHandler'} LOGGING['handlers']['management_playbooks'] = {'class': 'logging.NullHandler'}
DATABASES = {
'default': {
'ATOMIC_REQUESTS': True,
'ENGINE': 'awx.main.db.profiled_pg',
'NAME': 'awx',
'USER': 'awx',
'PASSWORD': '{{ awx_postgres_pass | quote }}',
'HOST': '{{ meta.name }}-postgres.{{ meta.namespace }}.svc.cluster.local',
'PORT': '5432',
}
}
if os.getenv("DATABASE_SSLMODE", False):
DATABASES['default']['OPTIONS'] = {'sslmode': os.getenv("DATABASE_SSLMODE")}
USE_X_FORWARDED_PORT = True USE_X_FORWARDED_PORT = True
BROADCAST_WEBSOCKET_PORT = 8052 BROADCAST_WEBSOCKET_PORT = 8052
BROADCAST_WEBSOCKET_PROTOCOL = 'http' BROADCAST_WEBSOCKET_PROTOCOL = 'http'