Merge "Fix keystone protocol for horizon in virtual-mcp-pike-{ssl|ssl-barbican}"diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index c3a531d..4a4fab2 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -20,6 +20,7 @@
- cluster.os-ha-contrail-40
parameters:
_param:
+ openstack_version: mitaka
keepalived_vip_interface: ${_param:opencontrail_control_interface_name}
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 778f57d..581ade2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -10,10 +10,11 @@
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
- system.apache.server.site.barbican
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -66,12 +67,10 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
@@ -79,8 +78,12 @@
apache_barbican_api_address: ${_param:cluster_local_address}
apache_barbican_api_host: ${_param:single_address}
apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
barbican_dogtag_nss_password: workshop
barbican_dogtag_host: ${_param:cluster_vip_address}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
# dogtag listens on 8443 but there is no way to bind it to
# Specific IP, as on this setup dogtag installed on ctl nodes
# Change port on haproxy side to avoid binding conflict.
@@ -101,6 +104,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 7c01446..22edcc6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -9,10 +9,11 @@
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -62,16 +63,18 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
nginx:
server:
site:
@@ -79,6 +82,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package: