Update opendaylight/neutron patch

Align opendaylight support patch with latest neutron formula.
Employ native ML2 backend/engine option as is instead of bringing
in the "opendaylight" keyword into reclass model.
Unfreeze the maas & neutron formulas versions.

Change-Id: I2807dcf9f83b01d453bca6453524f840c378972f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

1 files changed, 8 insertions, 23 deletions

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 b223f0515..cc2200679 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
@@ -11,25 +11,13 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400
 Subject: [PATCH] Bring in opendaylight support
 
 Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
----
- neutron/control/opendaylight/cluster.yml               | 18 ++++++++++++++++++
- neutron/control/opendaylight/single.yml                | 16 ++++++++++++++++
- neutron/gateway/opendaylight/single.yml                |  8 ++++++++
- opendaylight/server/single.yml                         |  2 ++
- reclass/storage/system/opendaylight_control_single.yml | 13 +++++++++++++
- 5 files changed, 57 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..81dd5f9
+index 00000000..a32e7abb
 --- /dev/null
 +++ b/neutron/control/opendaylight/cluster.yml
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,17 @@
 +classes:
 +- service.keepalived.cluster.single
 +- service.haproxy.proxy.single
@@ -39,7 +27,6 @@ index 0000000..81dd5f9
 +  neutron:
 +    server:
 +      backend:
-+        engine: opendaylight
 +        host: ${_param:opendaylight_service_host}
 +        rest_api_port: 8282
 +        user: admin
@@ -50,10 +37,10 @@ index 0000000..81dd5f9
 +            driver: opendaylight_v2
 diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
 new file mode 100644
-index 0000000..19af585
+index 00000000..053f14df
 --- /dev/null
 +++ b/neutron/control/opendaylight/single.yml
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,15 @@
 +classes:
 +- service.neutron.control.single
 +- system.neutron.control.openvswitch.single
@@ -61,7 +48,6 @@ index 0000000..19af585
 +  neutron:
 +    server:
 +      backend:
-+        engine: opendaylight
 +        host: ${_param:opendaylight_service_host}
 +        rest_api_port: 8282
 +        user: admin
@@ -72,21 +58,20 @@ index 0000000..19af585
 +            driver: opendaylight_v2
 diff --git a/neutron/gateway/opendaylight/single.yml b/neutron/gateway/opendaylight/single.yml
 new file mode 100644
-index 0000000..29c8d95
+index 00000000..21690017
 --- /dev/null
 +++ b/neutron/gateway/opendaylight/single.yml
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,7 @@
 +classes:
 +- service.neutron.gateway.single
 +parameters:
 +  neutron:
 +    gateway:
 +      backend:
-+        engine: opendaylight
 +        ovsdb_connection: tcp:127.0.0.1:6639
 diff --git a/opendaylight/server/single.yml b/opendaylight/server/single.yml
 new file mode 100644
-index 0000000..3d11872
+index 00000000..3d11872c
 --- /dev/null
 +++ b/opendaylight/server/single.yml
 @@ -0,0 +1,2 @@
@@ -94,7 +79,7 @@ index 0000000..3d11872
 +- service.opendaylight.server.single
 diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
 new file mode 100644
-index 0000000..ad809f5
+index 00000000..ad809f59
 --- /dev/null
 +++ b/reclass/storage/system/opendaylight_control_single.yml
 @@ -0,0 +1,13 @@