commit 73af7aab9dabe3a298d1a58b91d2aba9d2902fbe
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Oct 29 12:34:48 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Oct 29 12:34:48 2018 +0000
tree 5ac24d159a390b3c655bcc7d94fceca4346d3790
parent 7af6314ad3f5b8880a42d78bfb70b27b98d460e7
parent f27f7ba81a5882bc0935502e2eb1e2bd7810d487

Merge "Remove galera/mysql stuff from controllers"

neutron/control/cluster.yml

diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 52a91ea..18227df 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -3,7 +3,6 @@
 - service.haproxy.proxy.single
 - service.neutron.control.cluster
 - system.haproxy.proxy.listen.openstack.neutron
-- system.galera.server.database.neutron
 - system.salt.minion.cert.mysql.clients.openstack.neutron
 - system.salt.minion.cert.rabbitmq.clients.openstack.neutron
 parameters:

neutron/control/opencontrail/single.yml

diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index 5cf06bf..e47aa2c 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -1,6 +1,5 @@
 classes:
 - system.neutron.control.single
-- system.galera.server.database.neutron
 parameters:
   neutron:
     server:

neutron/control/single.yml

diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 40bdea3..2210f2f 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -1,6 +1,5 @@
 classes:
 - service.neutron.control.single
-- system.galera.server.database.neutron
 - system.salt.minion.cert.mysql.clients.openstack.neutron
 - system.salt.minion.cert.rabbitmq.clients.openstack.neutron
 parameters: