commit 1ca46dc175f13167e64536cc73fd99a962a983ef
author Mykyta Karpin <mkarpin@mirantis.com> Mon Aug 20 12:32:26 2018 +0300
committer Mykyta Karpin <mkarpin@mirantis.com> Mon Aug 20 11:05:36 2018 +0000
tree f32645bb18b2199f62fdc40e5042e323a1a103a9
parent 2e2de03fb89d00e1d7965cbc8c275d339f127fe3

Fix apache ssl reference

New version of ystem.apache.server.proxy.openstack.* has reference
on apache_proxy_ssl parameter and it fails to be merged with existing parameter.
So changing it to new default - apache_ssl.

Change-Id: I59ebf8bb1405dc0fc21f33af01f99a700f794cd2
Related-Prod: https://mirantis.jira.com/browse/PROD-22429
(cherry picked from commit b7d4ee0761664ec7b7743889253ec93e74999d3d)

classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
index 99cf126..20b8e54 100755
--- a/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/openstack/init.yml
@@ -20,15 +20,13 @@
     heat_service_protocol: ${_param:cluster_internal_protocol}
     cinder_service_protocol: ${_param:cluster_internal_protocol}
     designate_service_protocol: ${_param:cluster_internal_protocol}
-    apache_proxy_ssl:
+    apache_ssl:
       enabled: true
       engine: salt
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
       chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
-    apache_cinder_ssl: ${_param:apache_proxy_ssl}
-    apache_keystone_ssl: ${_param:apache_proxy_ssl}
     apache_proxy_openstack_api_address: ${_param:cluster_public_host}
     apache_proxy_openstack_keystone_host: 127.0.0.1
     apache_proxy_openstack_nova_host: 127.0.0.1