From 9d5755120a0aef983fec48d797ddd823c4e99c39 Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko@vexxhost.com>
Date: Fri, 10 Jul 2020 12:33:25 +0300
Subject: [PATCH] Replace horizon deployment with daemonset in update reconcile

Change-Id: I22c10ea4e79d713017e7b96c8c760bbcc34de715
---
 devstack/lib/heat                                             | 4 ++--
 openstack_operator/horizon.py                                 | 2 +-
 .../templates/operator/uwsgidefaultconfig.yml.j2              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/lib/heat b/devstack/lib/heat
index 0858d389..9dc35171 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -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
diff --git a/openstack_operator/horizon.py b/openstack_operator/horizon.py
index c0c5fac3..261cd76b 100644
--- a/openstack_operator/horizon.py
+++ b/openstack_operator/horizon.py
@@ -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:
diff --git a/openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2 b/openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2
index 4e5a3c4b..9d5f65ae 100644
--- a/openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2
+++ b/openstack_operator/templates/operator/uwsgidefaultconfig.yml.j2
@@ -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