Merge "[ha] Re-enable nginx proxy for Horizon"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_init.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index 0e753cd..d65e671 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -121,7 +121,6 @@ parameters:
     neutron_compute_agent_mode: legacy
     neutron_compute_external_access: 'True'
     galera_server_cluster_name: openstack_cluster
-    armband_repo_version: ${_param:openstack_version}
     glance_version: ${_param:openstack_version}
     glance_service_host: ${_param:openstack_control_address}
     keystone_version: ${_param:openstack_version}
@@ -150,8 +149,9 @@ parameters:
     horizon_identity_host: ${_param:openstack_control_address}
     horizon_identity_encryption: none
     horizon_identity_version: 3
+    nginx_server_site_nginx_proxy_openstack_web_enabled: True
     aodh_service_host: ${_param:openstack_telemetry_address}
-    gnocchi_version: 4.2
+    gnocchi_version: 4.3
     gnocchi_service_host: ${_param:openstack_telemetry_address}
     panko_version: ${_param:openstack_version}
     panko_service_host: ${_param:openstack_telemetry_address}