summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-12 19:42:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-12 19:42:34 +0000
commit2f58548c3e2f9068a2f6dfa682be7b462b41f29e (patch)
tree0b6e58be23a41a77df53da5c306c5a6c6ef5b215 /mcp/patches
parent8bd6edd252ca5e8f62ef24ae27fe4c8123ec82f7 (diff)
parent8dc566dbdca65c4ea8883477cafab1436d331d62 (diff)
Merge "[virtual/odl] Apply missing neutron.compute state"
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch39
-rw-r--r--mcp/patches/patches.list1
2 files changed, 40 insertions, 0 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
new file mode 100644
index 000000000..4c1d2ce8f
--- /dev/null
+++ b/mcp/patches/0001-Apply-opendaylight-client-state-on-compute-only.patch
@@ -0,0 +1,39 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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" %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index ca8ef17ce..9c460f8e8 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -5,6 +5,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+/usr/share/salt-formulas/env: 0001-Apply-opendaylight-client-state-on-compute-only.patch
/usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch
/usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch
/usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch