Skip to content

Commit 68aafc2

Browse files
authored
AAP-58983 store OAuth2 client_secret as podman secret (#200)
Signed-off-by: Justin Cinkelj <justin.cinkelj@xlab.si>
1 parent e304481 commit 68aafc2

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

setup/collections/ansible_collections/ansible/containerized_installer/roles/automationdashboard/tasks/facts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
_common_secrets:
3636
- 'dashboard_secret_key,target=/etc/dashboard/SECRET_KEY,mode=0400,uid={{ ansible_user_uid }}'
3737
- 'dashboard_database_key,target=/etc/dashboard/DATABASE_KEY,mode=0400,uid={{ ansible_user_uid }}'
38+
- 'dashboard_aap_auth_provider_client_secret,target=/etc/dashboard/AAP_AUTH_PROVIDER_CLIENT_SECRET,mode=0400,uid={{ ansible_user_uid }}'
3839
# - 'dashboard_channels,target=/etc/tower/conf.d/channels.py,mode=0400,uid={{ ansible_user_uid }}'
3940
- 'dashboard_postgres,target=/etc/dashboard/conf.d/postgres.py,mode=0400,uid={{ ansible_user_uid }}'
4041
_common_volumes:

setup/collections/ansible_collections/ansible/containerized_installer/roles/automationdashboard/tasks/secrets.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,15 @@
3131
# - Restart dashboard rsyslog
3232
- Restart dashboard task
3333
- Restart dashboard web
34+
35+
- name: Create the dashboard AAP_AUTH_PROVIDER_CLIENT_SECRET secret
36+
containers.podman.podman_secret:
37+
name: dashboard_aap_auth_provider_client_secret
38+
data: '{{ aap_auth_provider_client_secret }}'
39+
force: true
40+
skip_existing: false
41+
notify:
42+
# - Restart dashboard rsyslog
43+
- Restart dashboard task
44+
- Restart dashboard web
3445
...

setup/collections/ansible_collections/ansible/containerized_installer/roles/automationdashboard/templates/django_dashboard_conf.py.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ with open("/etc/dashboard/SECRET_KEY") as fin:
22
SECRET_KEY = fin.read()
33
with open("/etc/dashboard/DATABASE_KEY") as fin:
44
DATABASE_KEY = fin.read()
5+
with open("/etc/dashboard/AAP_AUTH_PROVIDER_CLIENT_SECRET") as fin:
6+
AAP_AUTH_PROVIDER_CLIENT_SECRET = fin.read()
57

68
ALLOWED_HOSTS=["*"]
79
CORS_ALLOWED_ORIGINS = [
@@ -28,7 +30,7 @@ AAP_AUTH_PROVIDER = {
2830
"user_data_endpoint": "{{ __aap_auth_provider_user_data_endpoint }}",
2931
"check_ssl": "{{ aap_auth_provider_check_ssl }}",
3032
"client_id": "{{ aap_auth_provider_client_id }}",
31-
"client_secret": "{{ aap_auth_provider_client_secret }}",
33+
"client_secret": AAP_AUTH_PROVIDER_CLIENT_SECRET,
3234
}
3335

3436
# Initial sync timedelta in days

0 commit comments

Comments
 (0)