summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-03 13:41:37 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-03 16:11:58 +0000
commitc60e5913d2c563c77d1e69a87f900e9fbf47eba7 (patch)
treef8146c64da41eab0dce07de2d440bd0a22c993c1
parentc2b84a6b0b9df4a831ffa5f948afacd9fe1bb48a (diff)
Apply neutron formula patch after formula update
Change-Id: I8dba3676adc8cc49731d91db7cc028a9c5b1627d Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 952b5cc60febe14df428f92280448327572d5c24)
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/patches/patches_neutron.list1
-rwxr-xr-xmcp/scripts/salt.sh1
3 files changed, 2 insertions, 1 deletions
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index 4140adb67..e20a34179 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -1,4 +1,3 @@
-/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.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-maas-region-use-authorized_keys-1st-entry.patch
diff --git a/mcp/patches/patches_neutron.list b/mcp/patches/patches_neutron.list
new file mode 100644
index 000000000..e80d7617d
--- /dev/null
+++ b/mcp/patches/patches_neutron.list
@@ -0,0 +1 @@
+/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 1ea8f5b8e..b0a26873d 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -69,4 +69,5 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
# Temporary fixup for mismatch between neutron formula and reclass model
salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \
version=2016.12.1+201709251458.f0607d9-1xenial1
+ cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas
SALT_INSTALL_END