Skip to content

Commit 95d0f66

Browse files
authored
Use new keycloak deployment (pt. 1) (#2048)
Old files that are no longer required are also removed. There are a few changes to make yamllint happy again. Signed-off-by: Christian Berendt <[email protected]>
1 parent 47b68ea commit 95d0f66

18 files changed

+30
-1264
lines changed

.yamllint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ rules:
88
ignore: |
99
.git
1010
.tox
11-
contrib/rally/tests/
1211
environments/infrastructure/secrets.yml
1312
environments/kolla/files/overlays/ceilometer/event_definitions.yaml
1413
environments/kolla/files/overlays/ceilometer/event_pipeline.yaml

contrib/ansible/dns.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"cgit": "5"
1717
"flower": "5"
1818
"homer": "5"
19-
"keycloak": "5"
19+
"keycloak": "100"
2020
"netbox": "5"
2121
"netdata": "5"
2222
"nexus": "5"

environments/custom/configuration.yml

+3-44
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,4 @@
11
---
2-
# keycloak
3-
4-
keycloak_kcadm_binary: "/opt/jboss/keycloak/bin/kcadm.sh"
5-
keycloak_realm: "osism"
6-
keycloak_url: "http://localhost:8080"
7-
keycloak_service_container_name: "keycloak"
8-
9-
# keycloak-ldap-federation-config
10-
11-
keycloak_ldap_storage_provider_component_name: "ldap-provider"
12-
keycloak_ldap_user: "keycloak-user"
13-
keycloak_ldap_binddn: "uid={{ keycloak_ldap_user }},{{ ldap_users }}"
14-
15-
# keycloak-oidc-client-config
16-
17-
keycloak_admin_id: "admin"
18-
keycloak_key_provider_component_name: "rsa-for-keystone"
19-
20-
keystone_client_id: "keystone"
21-
keystone_redirect_uris:
22-
- "https://api.testbed.osism.xyz:5000/redirect_uri"
23-
- "https://api.testbed.osism.xyz"
24-
- "https://192.168.16.254:5000/redirect_uri"
25-
- "https://192.168.16.254"
26-
27-
keycloak_private_key_file_path: "{{ configuration_directory }}/environments/custom/files/keycloak/private_key.pem"
28-
keycloak_private_key_data: "{{ lookup('file', keycloak_private_key_file_path)| regex_replace('\n', '\\\\n') }}"
29-
30-
keycloak_certificate_file_path: "{{ configuration_directory }}/environments/custom/files/keycloak/cert.crt"
31-
keycloak_certificate_data: "{{ lookup('file', keycloak_certificate_file_path)| regex_replace('\n', '\\\\n') }}"
32-
33-
# openldap
34-
35-
openldap_service_container_name: "openldap"
36-
ldap_base: "dc=osism,dc=local"
37-
# In case of OpenLDAP this should be {{ openldap_password }}
38-
ldap_password: password
39-
ldap_url: "ldap://{{ openldap_host }}:389"
40-
ldap_users: "cn=users,{{ ldap_base }}"
41-
42-
# umc-config
43-
44-
umc_ldap_user: "umc-admin"
45-
umc_ldap_binddn: "uid={{ umc_ldap_user }},{{ ldap_users }}"
2+
# Dummy variable to avoid error because ansible does not recognize the
3+
# file as a good configuration file when no variable in it.
4+
dummy:

environments/custom/files/keycloak/cert.crt

-59
This file was deleted.

environments/custom/files/keycloak/private_key.pem

-167
This file was deleted.

environments/custom/files/openldap/domain-admin-policy.ldif.j2

-13
This file was deleted.

0 commit comments

Comments
 (0)