X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=mcp%2Fpatches%2Freclass-system-salt-model%2F0001-Bring-in-opendaylight-support.patch;h=353854c1bca40a9fed828e1b02895a34345e6498;hb=09e1c843f54a349543784484ef657f3880c8b103;hp=15f23db34877f9a0cd0be62d00cdd35bbbd74309;hpb=8d7128a62cd2f9b3df1d59bf4aa4fa7a387b1679;p=fuel.git

diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
index 15f23db34..353854c1b 100644
--- a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
+++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch
@@ -3,30 +3,17 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400
 Subject: [PATCH] Bring in opendaylight support
 
 Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
----
- neutron/control/opendaylight/cluster.yml              | 19 +++++++++++++++++++
- neutron/control/opendaylight/single.yml               | 16 ++++++++++++++++
- neutron/gateway/opendaylight/single.yml               |  8 ++++++++
- opendaylight/server/single.yml                        |  2 ++
- .../storage/system/opendaylight_control_single.yml    | 15 +++++++++++++++
- 5 files changed, 60 insertions(+)
- create mode 100644 neutron/control/opendaylight/cluster.yml
- create mode 100644 neutron/control/opendaylight/single.yml
- create mode 100644 neutron/gateway/opendaylight/single.yml
- create mode 100644 opendaylight/server/single.yml
- create mode 100644 reclass/storage/system/opendaylight_control_single.yml
 
 diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
 new file mode 100644
-index 0000000..4133650
+index 0000000..81dd5f9
 --- /dev/null
 +++ b/neutron/control/opendaylight/cluster.yml
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,18 @@
 +classes:
 +- service.keepalived.cluster.single
 +- service.haproxy.proxy.single
 +- service.neutron.control.cluster
-+- system.haproxy.proxy.listen.openstack.neutron
 +- system.neutron.control.openvswitch.cluster
 +parameters:
 +  neutron: