commit 2c3e0f9c58389513e929654f6b91908f9a8f01fe
author Tatyana Leontovich <tleontovich@mirantis.com> Mon Jul 16 16:12:56 2018 +0300
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Jul 16 18:50:42 2018 +0300
tree 25302a343148803adf68306aa842b191f903c38d
parent cb6cfccf4ae95a4513b2cfc3856ab1051fbbe7f6

Disbale ssl on redirect

Also cleanup nginx from cfg node

Change-Id: I328dba819fabe1ef6b4c7d4652febc87b5c91c9b

classes/cluster/virtual-offline-pike-ovs/openstack/init.yml

diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
index 9f1aba9..e529290 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
@@ -7,6 +7,7 @@
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
+    cluster_internal_protocol: http
     cluster_public_host: 172.16.10.254
     neutron_public_protocol: http
     neutron_control_dvr: False
@@ -89,6 +90,12 @@
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
+    keystone_service_protocol: ${_param:cluster_internal_protocol}
+    glance_service_protocol: ${_param:cluster_internal_protocol}
+    nova_service_protocol: ${_param:cluster_internal_protocol}
+    neutron_service_protocol: ${_param:cluster_internal_protocol}
+    heat_service_protocol: ${_param:cluster_internal_protocol}
+    cinder_service_protocol: ${_param:cluster_internal_protocol}
     glusterfs_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
     metadata_password: workshop

classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml

diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
index b59f9ce..ee06caf 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
@@ -9,7 +9,7 @@
   _param:
     cluster_public_host:  ${_param:openstack_proxy_address}
     nginx_proxy_ssl:
-      enabled: true
+      enabled: false
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
@@ -19,5 +19,5 @@
       site:
         nginx_ssl_redirect_openstack_web:
           redirect:
-            protocol: https
+            protocol: http
             host: $host