vexxhost/openstack-operator
Code Issues Proposed changes

Replace horizon deployment with daemonset in update reconcile

Browse Source 
Change-Id: I22c10ea4e79d713017e7b96c8c760bbcc34de715
This commit is contained in:
okozachenko 2020-07-10 12:33:25 +03:00
parent 528f64494d
commit 9d5755120a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/heat
View File

@ -138,14 +138,14 @@ function configure_heat {
# the section for the client plugin associated with the trustee
if [ -z "$HEAT_DEFERRED_AUTH" -o "trusts" == "$HEAT_DEFERRED_AUTH" ]; then
iniset $HEAT_CONF trustee auth_type password
iniset $HEAT_CONF trustee auth_url $KEYSTONE_AUTH_URI
iniset $HEAT_CONF trustee auth_url $KEYSTONE_AUTH_URI_V3
iniset $HEAT_CONF trustee username $HEAT_TRUSTEE_USER
iniset $HEAT_CONF trustee password $HEAT_TRUSTEE_PASSWORD
iniset $HEAT_CONF trustee user_domain_id $HEAT_TRUSTEE_DOMAIN
fi
# clients_keystone
iniset $HEAT_CONF clients_keystone auth_uri $KEYSTONE_AUTH_URI
iniset $HEAT_CONF clients_keystone auth_uri $KEYSTONE_AUTH_URI_V3
if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
iniset $HEAT_CONF clients_keystone ca_file $SSL_BUNDLE_FILE

2
openstack_operator/horizon.py
View File

@ -77,7 +77,7 @@ def update(name, spec, **_):
name=name, spec=spec)
config_hash = utils.generate_hash(config.obj['data'])
utils.create_or_update('horizon/deployment.yml.j2',
utils.create_or_update('horizon/daemonset.yml.j2',
config_hash=config_hash, name=name,
spec=spec)
if "ingress" in spec:

4
openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2
View File

@ -11,12 +11,12 @@ data:
exit-on-reload = true
die-on-term = true
lazy-apps = true
add-header = 'Connection: close'
add-header = Connection: close
buffer-size = 65535
thunder-lock = true
http-auto-chunked = true
http-raw-body = true
socket-timeout = 10
need-app = true
route-user-agent = '^kube-probe.* donotlog:'
route-user-agent = ^kube-probe.* donotlog:
log-x-forwarded-for = true