[salt.sh] Armband extra repo for forked reclass

[fuel.git] / mcp / patches / reclass-system-salt-model / 0001-Bring-in-opendaylight-support.patch

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 adf07eb..8d47cc4 100644 (file)
--- 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
@@ -1,15 +1,23 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Michael Polenchuk <mpolenchuk@mirantis.com>
 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    | 13 +++++++++++++
- 5 files changed, 58 insertions(+)
+ neutron/control/opendaylight/cluster.yml               | 17 +++++++++++++++++
+ neutron/control/opendaylight/single.yml                | 15 +++++++++++++++
+ neutron/gateway/opendaylight/single.yml                |  7 +++++++
+ opendaylight/server/single.yml                         |  2 ++
+ reclass/storage/system/opendaylight_control_single.yml | 13 +++++++++++++
+ 5 files changed, 54 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
@@ -18,21 +26,19 @@ Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2
 
 diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
 new file mode 100644
-index 0000000..4133650
+index 0000000..a32e7ab
 --- /dev/null
 +++ b/neutron/control/opendaylight/cluster.yml
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,17 @@
 +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:
 +    server:
 +      backend:
-+        engine: opendaylight
 +        host: ${_param:opendaylight_service_host}
 +        rest_api_port: 8282
 +        user: admin
@@ -43,10 +49,10 @@ index 0000000..4133650
 +            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 0000000..053f14d
 --- /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
@@ -54,7 +60,6 @@ index 0000000..19af585
 +  neutron:
 +    server:
 +      backend:
-+        engine: opendaylight
 +        host: ${_param:opendaylight_service_host}
 +        rest_api_port: 8282
 +        user: admin
@@ -65,17 +70,16 @@ 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 0000000..2169001
 --- /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