smartvillage with rhsoo changes (#7698)

redhat-cop · Apr 19, 2024 · 03ca0b2 · 03ca0b2
1 parent 21df7fc
commit 03ca0b2
Show file tree

Hide file tree

Showing 11 changed files with 645 additions and 1 deletion.
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhsso_authentication/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_rhsso_authentication/defaults/main.yml
@@ -22,3 +22,10 @@ ocp4_workload_rhsso_authentication_user_password: "{{
   common_password | default(lookup('password', '/dev/null chars=ascii_letters,digits '~ 'length=' ~ 10)) }}"
 
 ocp4_workload_rhsso_authentication_remove_kubeadmin: true
+
+# If you're creating the "openshift" realm and want to add Realm Roles:
+# ocp4_workload_rhsso_authentication_openshift_realm_roles:
+# - "Public"
+# If you're creating the "openshift" client and want to add more redirect uris:
+# ocp4_workload_rhsso_authentication_openshift_redirect_uris:
+# - "https://smartvillage-web-smartvillage.apps.cluster-*"
diff --git a/..._ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-client-openshift.yml.j2 b/..._ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-client-openshift.yml.j2
@@ -11,7 +11,12 @@ spec:
   client:
     clientAuthenticatorType: client-secret
     redirectUris:
-    - https://{{ ocp4_workload_rhsso_authentication_openshift_redirect_host }}/oauth2callback/rhsso
+      - https://{{ ocp4_workload_rhsso_authentication_openshift_redirect_host }}/oauth2callback/rhsso
+{% if ocp4_workload_rhsso_authentication_openshift_redirect_uris is defined %}
+{% for uri in ocp4_workload_rhsso_authentication_openshift_redirect_uris %}
+      - {{ uri }}
+{% endfor %}
+{% endif %}
     serviceAccountsEnabled: true
     clientId: idp-4-ocp
     defaultClientScopes:

diff --git a/...s_ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-realm-openshift.yml.j2 b/...s_ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-realm-openshift.yml.j2
@@ -18,3 +18,10 @@ spec:
     enabled: true
     id: openshift
     realm: openshift
+    {% if ocp4_workload_rhsso_authentication_openshift_realm_roles is defined -%}
+    {% for role in ocp4_workload_rhsso_authentication_openshift_realm_roles -%}
+    roles:
+      realm:
+      - name: {{ role}}
+    {%- endfor %}
+    {%- endif %}
diff --git a/...es_ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-user-openshift.yml.j2 b/...es_ocp_workloads/ocp4_workload_rhsso_authentication/templates/rhsso-user-openshift.yml.j2
@@ -23,3 +23,9 @@ spec:
     email: {{ username }}@demo.redhat.com
     enabled: true
     emailVerified: true
+    {% if ocp4_workload_rhsso_authentication_openshift_realm_roles is defined -%}
+    realmRoles:
+    {% for role in ocp4_workload_rhsso_authentication_openshift_realm_roles -%}
+    - {{ role }}
+    {%- endfor %}
+    {%- endif %}
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_smartvillage/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_smartvillage/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+become_override: false
+ocp_username: system:admin
+silent: false
+
+ocp4_workload_smartvillage_version: smartvillage