Remove keycloak integration from testbed (#2600)

We will add it again later when the Keycloak integration has been revised.

Signed-off-by: Christian Berendt <[email protected]>

Author: berendt

Makefile

@@ -120,14 +120,6 @@ baremetal: setup manager ## Deploy only baremetal services.
 	  TERRAFORM=$(TERRAFORM) \
 	  deploy-baremetal
 
-.PHONY: identity
-identity: setup manager ## Deploy only identity services.
-	make -C terraform \
-	  CLOUD=$(CLOUD) \
-	  ENVIRONMENT=$(ENVIRONMENT) \
-	  TERRAFORM=$(TERRAFORM) \
-	  deploy-identity
-
 .PHONY: ceph
 ceph: setup manager ## Deploy only ceph services.
 	make -C terraform \

contrib/openstack-cli/clouds-public.yaml

@@ -6,16 +6,3 @@ public-clouds:
       auth_url: https://api.testbed.osism.xyz:5000
     interface: 'public'
     identity_api_version: 3
-  testbed-keycloak:
-    cacert: ~/.config/openstack/testbed.crt
-    auth:
-      auth_url: https://api.testbed.osism.xyz:5000
-      # yamllint disable-line rule:line-length
-      discovery_endpoint: https://keycloak.testbed.osism.xyz/auth/realms/osism/.well-known/openid-configuration
-      protocol: openid
-      client_id: keystone
-      client_secret: 0056b89c-030f-486b-a6ad-f0fa398fa4ad
-    interface: 'public'
-    identity_api_version: 3
-    auth_type: v3oidcpassword
-    identity_provider: keycloak

contrib/openstack-cli/clouds.yaml.example

@@ -22,8 +22,3 @@ clouds:
       project_name: test
       project_domain_name: default
       user_domain_name: default
-  testbed-alice:
-    profile: testbed-keycloak
-    auth:
-      username: alice
-      project_name: test

environments/infrastructure/configuration.yml

@@ -24,7 +24,6 @@ homer_url_ceph: "https://api-int.testbed.osism.xyz:8140"
 homer_url_flower: "https://flower.testbed.osism.xyz/"
 homer_url_grafana: "https://api-int.testbed.osism.xyz:3000"
 homer_url_horizon: "https://api.testbed.osism.xyz/"
-homer_url_keycloak: "https://keycloak.testbed.osism.xyz/auth"
 homer_url_kibana: "https://api-int.testbed.osism.xyz:5601"
 homer_url_netbox: "https://netbox.testbed.osism.xyz"
 homer_url_netdata: "http://testbed-manager:19999"
@@ -33,12 +32,6 @@ homer_url_phpmyadmin: "https://phpmyadmin.testbed.osism.xyz/"
 homer_url_prometheus: "https://api-int.testbed.osism.xyz:9091/"
 homer_url_rabbitmq: "https://api-int.testbed.osism.xyz:15672/"
 
-##########################
-# keycloak
-
-keycloak_traefik: true
-keycloak_host: keycloak.testbed.osism.xyz
-
 ##########################
 # netbox
 

environments/kolla/configuration.yml

@@ -38,10 +38,6 @@ openstack_logging_debug: "True"
 opensearch_soft_retention_period_days: 1
 opensearch_hard_retention_period_days: 1
 
-# keystone
-enable_keystone_federation: "no"
-keystone_enable_federation_openid: "no"
-
 # neutron
 neutron_plugin_agent: ovn
 neutron_ovn_availability_zones:

environments/kolla/files/overlays/horizon/_9999-custom-settings.py

@@ -29,7 +29,6 @@ docker_proxy_no_proxy_extra:
   - api-int
   - api-int.testbed.osism.xyz
   - api.testbed.osism.xyz
-  - keycloak.testbed.osism.xyz
   - nexus.testbed.osism.xyz
   - testbed-manager
 
@@ -48,7 +47,6 @@ proxy_no_proxy_extra:
   - api-int
   - api-int.testbed.osism.xyz
   - api.testbed.osism.xyz
-  - keycloak.testbed.osism.xyz
   - nexus.testbed.osism.xyz
   - testbed-manager
 

environments/kolla/files/overlays/horizon/custom_local_settings

@@ -36,9 +36,6 @@ sed -i "s/auth_url: .*/auth_url: https:\/\/${api_fqdn}:5000\/v3/g" /opt/configur
 # overwrite fqdn for internal use
 sed -i "s/api.testbed.osism.xyz: .*/${api_fqdn}: 192.168.16.254/g" /opt/configuration/environments/configuration.yml
 
-# do not use keystone logout url
-sed -i "/keystone_logout_url: .*/d" /opt/configuration/environments/kolla/configuration.yml
-
 # add traefik ports + services + routers
 cat >> /opt/configuration/environments/infrastructure/configuration.yml <<%EOF
 

environments/kolla/files/overlays/keystone/federation/oidc/attribute_maps/oidc_attribute_mappingId1.json

@@ -21,14 +21,6 @@ docker version
 # deploy manager ervice
 sh -c '/opt/configuration/scripts/deploy/000-manager.sh'
 
-# Do not use the Keystone/Keycloak integration by default. We only use this integration
-# in a special identity testbed.
-rm -f /opt/configuration/environments/kolla/files/overlays/horizon/_9999-custom-settings.py
-rm -f /opt/configuration/environments/kolla/files/overlays/horizon/custom_local_settings
-rm -f /opt/configuration/environments/kolla/files/overlays/keystone/wsgi-keystone.conf
-rm -f /opt/configuration/environments/kolla/group_vars/keystone.yml
-rm -rf /opt/configuration/environments/kolla/files/overlays/keystone/federation
-
 # bootstrap nodes
 osism apply operator -u $IMAGE_NODE_USER -l testbed-nodes
 osism apply --environment custom facts