Skip to content

Commit 1e9c6b2

Browse files
byalifAlif Rahijasmin-30
authored
[patch] Added additional ca.crt field to rsl secret (#1839)
Co-authored-by: Alif Rahi <“alif.rahi@ibm.com”> Co-authored-by: Jasmin Makwana <jasminmakwana1999@gmail.com>
1 parent bb80a47 commit 1e9c6b2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

ibm/mas_devops/roles/aiservice_tenant/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,4 @@ aiservice_rsl_secret: "{{ aiservice_tenant_name }}----rsl-secret" # this is igno
6666
rsl_url: "{{ lookup('env', 'RSL_URL') | default('', true) }}"
6767
rsl_org_id: "{{ lookup('env', 'RSL_ORG_ID') | default('', true) }}"
6868
rsl_token: "{{ lookup('env', 'RSL_TOKEN') | default('', true) }}"
69+
rsl_ca_crt: "{{ lookup('env', 'RSL_CA_CRT') | default('', true) }}"

ibm/mas_devops/roles/aiservice_tenant/tasks/config_rsl/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
- name: "Check if all RSL config values are present"
33
ansible.builtin.set_fact:
4-
rsl_config_valid: "{{ rsl_url | length > 0 and rsl_org_id | length > 0 and rsl_token | length > 0 }}"
4+
rsl_config_valid: "{{ rsl_url | length > 0 and rsl_org_id | length > 0 and rsl_token | length > 0 and rsl_ca_crt | length > 0 }}"
55

6-
- name: "Set RSL Secret name"
6+
- name: "Unset RSL Secret name"
77
ansible.builtin.set_fact:
88
aiservice_rsl_secret: ""
99
when: not rsl_config_valid
1010

11-
- name: "warning about RSL config being incomplete"
11+
- name: "Warning about RSL config being incomplete"
1212
ansible.builtin.debug:
1313
msg: "WARNING: RSL config is incomplete. Skipping RSL secret creation."
1414
when: not rsl_config_valid

ibm/mas_devops/roles/aiservice_tenant/templates/rsl/rsl-secret.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ data:
1717
rsl_org_id: "{{ rsl_org_id | b64encode }}"
1818
rsl_url: "{{ rsl_url | b64encode }}"
1919
rsl_token: "{{ rsl_token | b64encode }}"
20+
ca.crt: "{{ rsl_ca_crt | b64encode }}"

0 commit comments

Comments
 (0)