diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:34:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:04:52 +0000 |
| commit | e7e2d84bec0d404057bce203f9c90231360e88ee (patch) | |
| tree | 43e54e897217da67906580991c3c7f0a110250e8 /patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch | |
| parent | 70f2caa773fc5f0e2b1154a5c095665375f02666 (diff) | |
Rebase: deploy related patch series.
After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.
While we're at it, re-export Fuel@OPNFV patches in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
Diffstat (limited to 'patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch')
| -rw-r--r-- | patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch new file mode 100644 index 00000000..c47b166c --- /dev/null +++ b/patches/opnfv-fuel/0024-Allow-customizing-fuel-plugin-opendaylight.patch @@ -0,0 +1,26 @@ +From: Florin Dumitrascu <florin.dumitrascu@enea.com> +Date: Thu, 17 Mar 2016 19:37:19 +0100 +Subject: [PATCH] Allow customizing fuel-plugin-opendaylight + +Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> +--- + build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk +index e64a05e..bca432c 100644 +--- a/build/f_isoroot/f_odlpluginbuild/config.mk ++++ b/build/f_isoroot/f_odlpluginbuild/config.mk +@@ -7,9 +7,9 @@ + # http://www.apache.org/licenses/LICENSE-2.0 + ############################################################################## + +-ODL_BRANCH=brahmaputra-sr2 +-ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a +-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" ++ODL_BRANCH:=brahmaputra-sr2 ++ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a ++ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" + + export USE_JAVA8=true + export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb |