Merge "Use a single class to create 'neutron' database"
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 9beed6b..47928b6 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -3,6 +3,7 @@
- service.haproxy.proxy.single
- service.neutron.control.cluster
- system.haproxy.proxy.listen.openstack.neutron
+- system.galera.server.database.neutron
parameters:
linux:
system:
@@ -10,20 +11,6 @@
python-pymysql:
fromrepo: ${_param:openstack_version}
version: latest
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all
haproxy:
proxy:
listen:
diff --git a/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
index caaaf6d..d85e554 100644
--- a/neutron/control/opencontrail/cluster.yml
+++ b/neutron/control/opencontrail/cluster.yml
@@ -3,21 +3,8 @@
- service.haproxy.proxy.single
- service.neutron.control.cluster
- system.haproxy.proxy.listen.openstack.neutron
+- system.galera.server.database.neutron
parameters:
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all
neutron:
server:
dns_domain: ${_param:cluster_domain}
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 0c2841b..4bbd8f8 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -1,20 +1,7 @@
classes:
- service.neutron.control.single
+- system.galera.server.database.neutron
parameters:
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all
neutron:
server:
dns_domain: ${_param:cluster_domain}
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index c840e9a..54db248 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -2,6 +2,7 @@
- service.keepalived.cluster.single
- service.haproxy.proxy.single
- service.neutron.control.cluster
+- system.galera.server.database.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -37,20 +38,6 @@
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- host: ${_param:openstack_message_queue_node03_address}
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all
haproxy:
proxy:
listen:
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 1b830f6..bdc050d 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -1,5 +1,6 @@
classes:
- service.neutron.control.single
+- system.galera.server.database.neutron
parameters:
_param:
neutron_control_dvr: True
@@ -33,17 +34,3 @@
message_queue:
members:
- host: ${_param:openstack_message_queue_node01_address}
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all
\ No newline at end of file
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index e412f36..7f02325 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,5 +1,6 @@
classes:
- service.neutron.control.single
+- system.galera.server.database.neutron
parameters:
linux:
system:
@@ -11,18 +12,3 @@
server:
database:
host: ${_param:single_address}
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:single_address}
- rights: all
-