summaryrefslogtreecommitdiffstats
path: root/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-28 13:50:33 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-28 15:50:31 +0400
commit3b338ea9f19052eb4cf3dc70d9d49d03cb602ef2 (patch)
tree435b886a1da4acb544513676f93bd137b8bf9096 /mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch
parent10a36807bc6ec0db532a93f6dbb2b42ec1c47617 (diff)
[odl] Setup manager target after ovs host config
Change-Id: Ia517b7cf1723a5afaf43cb0709716f3a67a29e9f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch')
-rw-r--r--mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch b/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch
deleted file mode 100644
index 4c1d2ce8f..000000000
--- a/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Mon, 12 Mar 2018 16:32:50 +0400
-Subject: [PATCH] Apply opendaylight client state on compute only
-
-Change-Id: I07cd760fdb4ce84aba21450af9246c8c9128118f
-
-diff --git a/neutron/compute.sls b/neutron/compute.sls
-index 418282d..7ff136a 100644
---- a/neutron/compute.sls
-+++ b/neutron/compute.sls
-@@ -2,6 +2,10 @@
- {%- if compute.enabled %}
-
- {% if compute.backend.engine == "ml2" %}
-+{%- if compute.opendaylight is defined %}
-+include:
-+ - .opendaylight.client
-+{%- else %}
- neutron_compute_packages:
- pkg.installed:
- - names: {{ compute.pkgs }}
-@@ -243,9 +247,6 @@ rabbitmq_ca_neutron_compute:
- {%- endif %}
- {%- endif %}
-
--{%- if compute.opendaylight is defined %}
--include:
-- - .opendaylight.client
- {%- endif %}
-
- {%- elif compute.backend.engine == "ovn" %}