diff --git a/openstack_operator/horizon.py b/openstack_operator/horizon.py index efbcab77..a819d5a3 100644 --- a/openstack_operator/horizon.py +++ b/openstack_operator/horizon.py @@ -44,10 +44,8 @@ def create_or_resume(name, spec, **_): """ # Grab the secretkey secret - conn = utils.get_openstack_connection() - auth_url = conn.config.auth["auth_url"] config = utils.create_or_update('horizon/configmap.yml.j2', - name=name, spec=spec, auth_url=auth_url) + name=name, spec=spec) config_hash = utils.generate_hash(config.obj['data']) env = utils.get_uwsgi_env() utils.create_or_update('horizon/deployment.yml.j2', @@ -71,10 +69,8 @@ def update(name, spec, **_): This function updates the deployment for horizon if there are any changes that happen within it. """ - conn = utils.get_openstack_connection() - auth_url = conn.config.auth["auth_url"] config = utils.create_or_update('horizon/configmap.yml.j2', - name=name, spec=spec, auth_url=auth_url) + name=name, spec=spec) config_hash = utils.generate_hash(config.obj['data']) env = utils.get_uwsgi_env() utils.create_or_update('horizon/deployment.yml.j2', diff --git a/openstack_operator/templates/horizon/configmap.yml.j2 b/openstack_operator/templates/horizon/configmap.yml.j2 index 858d5872..9294abfa 100644 --- a/openstack_operator/templates/horizon/configmap.yml.j2 +++ b/openstack_operator/templates/horizon/configmap.yml.j2 @@ -36,7 +36,7 @@ data: }, } - OPENSTACK_KEYSTONE_URL = '{{ auth_url }}' + OPENSTACK_KEYSTONE_URL = 'http://keystone.openstack.svc.cluster.local' OPENSTACK_NEUTRON_NETWORK['enable_ha_router'] = True {% if spec.multidomain is not defined %}