From 3b338ea9f19052eb4cf3dc70d9d49d03cb602ef2 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 28 Mar 2018 13:50:33 +0400 Subject: [odl] Setup manager target after ovs host config Change-Id: Ia517b7cf1723a5afaf43cb0709716f3a67a29e9f Signed-off-by: Michael Polenchuk --- ...opendaylight-client-state-on-compute-only.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch (limited to 'mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch') 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 -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" %} -- cgit 1.2.3-korg