fix neutron ovs/dvr, fix opencontail proxy, fix mysql client
diff --git a/mysql/client/single.yml b/mysql/client/single.yml
index 1ad0957..e273e2f 100644
--- a/mysql/client/single.yml
+++ b/mysql/client/single.yml
@@ -8,13 +8,15 @@
- system.mysql.client.database.nova_api
- system.mysql.client.database.neutron
parameters:
+ _param:
+ mysql_client_host: localhost
mysql:
client:
enabled: true
server:
database:
admin:
- host: ${_param:cluster_vip_address}
+ host: ${_param:mysql_client_host}
port: 3306
user: ${_param:mysql_admin_user}
password: ${_param:mysql_admin_password}
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index a6d9d95..dfc3c82 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -22,6 +22,13 @@
mechanism:
ovs:
driver: openvswitch
+ database:
+ host: ${_param:openstack_database_address}
+ message_queue:
+ members:
+ - host: ${_param:openstack_message_queue_node01_address}
+ - host: ${_param:openstack_message_queue_node02_address}
+ - host: ${_param:openstack_message_queue_node03_address}
mysql:
server:
database:
diff --git a/nginx/server/proxy/opencontrail_web.yml b/nginx/server/proxy/opencontrail_web.yml
index 02f75bd..85169b3 100644
--- a/nginx/server/proxy/opencontrail_web.yml
+++ b/nginx/server/proxy/opencontrail_web.yml
@@ -8,7 +8,7 @@
type: nginx_proxy
name: contrail
proxy:
- host: ${_param:cluster_vip_address}
+ host: ${_param:opencontrail_control_address}
port: 8143
protocol: https
host: