vexxhost/openstack-operator
Code Issues Proposed changes

Merge "Use constant url for keystone in horizon"

Browse Source
This commit is contained in:
Zuul 2020-06-25 21:15:25 +00:00 committed by Gerrit Code Review
commit 6a96e2419d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_operator/horizon.py
View File

@ -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',

2
openstack_operator/templates/horizon/configmap.yml.j2
View File

@ -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 %}