Merge "Disbale ssl on redirect"
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index a3b626b..2ff558e 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -10,7 +10,6 @@
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.aodh
- system.keystone.client.service.ceilometer
@@ -25,7 +24,6 @@
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-offline-pike-ovs.openstack.proxy
- cluster.virtual-offline-pike-ovs.stacklight.proxy
- cluster.virtual-offline-pike-ovs
parameters:
@@ -49,14 +47,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: prx
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
reactor:
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
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