commit 82ad3533ab06f0aff91803f9905cb38d6a35cb9d
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Apr 03 12:13:58 2018 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> Tue Apr 03 12:13:58 2018 +0000
tree 71375aead50553fcaefda05ccecba41b2ff6420e
parent aad14e2da15eb7d15d03c1a65e146f0b379df0a5
parent 34a8a3b6b6f88f036f3a5f43491adc49805e1e84

Merge "Fix keystone protocol for horizon in virtual-mcp-pike-{ssl|ssl-barbican}"

classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 18ab132..77c4add 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -209,7 +209,7 @@
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
-    horizon_identity_encryption: none
+    horizon_identity_encryption: ssl
     horizon_identity_version: 2
     ceilometer_secret_key: workshop
     ceilometer_agent_default_polling_interval: 15

classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 35f71e8..e866362 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -206,7 +206,7 @@
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
-    horizon_identity_encryption: none
+    horizon_identity_encryption: ssl
     horizon_identity_version: 2
     ceilometer_secret_key: workshop
     ceilometer_agent_default_polling_interval: 15