Add several fixes for openstack deployment
* Disable ssl for galera and rabbitmq properly. As we set
(galera|rabbitmq)_ssl_enabled to False, we need to remove
include of ssl classes for those services
* Fix host param for nginx openstack web site
* Include data for neutron database
Change-Id: I406edd496898f77f75b03e774c20c32d455bbdaf
Related-bug: #PROD-25745 (PROD:25745)
diff --git "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/control.yml" "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/control.yml"
index a9d14d2..191e46e 100644
--- "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/control.yml"
+++ "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/control.yml"
@@ -21,8 +21,8 @@
{%- endif %}
- service.git.client
- system.openssh.client.lab
-- system.salt.minion.cert.mysql.server
-- system.salt.minion.cert.proxy
+#- system.salt.minion.cert.mysql.server
+#- system.salt.minion.cert.proxy
- system.memcached.server.single
- system.auditd.server.ciscat
- cluster.{{ cookiecutter.cluster_name }}.openstack
diff --git "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/database.yml" "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/database.yml"
index 6877946..22637f1 100644
--- "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/database.yml"
+++ "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/database.yml"
@@ -1,5 +1,5 @@
classes:
-- service.galera.ssl
+#- service.galera.ssl
- service.galera.master.cluster
- system.galera.server.database.cinder
- system.galera.server.database.designate
@@ -7,6 +7,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.neutron
parameters:
galera:
master:
diff --git "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/message_queue.yml" "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/message_queue.yml"
index 7f1599a..018ea52 100644
--- "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/message_queue.yml"
+++ "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/message_queue.yml"
@@ -1,8 +1,8 @@
classes:
-- service.rabbitmq.server.ssl
+#- service.rabbitmq.server.ssl
- system.rabbitmq.server.vhost.openstack
- system.rabbitmq.server.single
-- system.salt.minion.cert.rabbitmq_server
+#- system.salt.minion.cert.rabbitmq_server
parameters:
rabbitmq:
server:
diff --git "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/proxy.yml" "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/proxy.yml"
index 9157b20..4d03810 100644
--- "a/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/proxy.yml"
+++ "b/cluster_product/openstack/\173\173 cookiecutter.cluster_name \175\175/openstack/proxy.yml"
@@ -16,7 +16,7 @@
type: nginx_proxy
name: openstack_web
proxy:
- host: localhost
+ host: ${_param:single_address}
# TODO: port must be configurable, as some deployments might have HAproxy over prx nodes
port: 8078
size: 10000m