summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch3
-rw-r--r--patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch3
-rw-r--r--patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch3
-rw-r--r--patches/opnfv-fuel/0004-Follow-redirects.patch3
-rw-r--r--patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch3
-rw-r--r--patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch3
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch3
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch3
-rw-r--r--patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch24
9 files changed, 24 insertions, 24 deletions
diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
index eac38f74..d30a954c 100644
--- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
+++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
@@ -19,6 +19,3 @@ index e11d033..2a81027 100644
MOS_VERSION = 8.0
OPENSTACK_VERSION = liberty-8.0
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
index 4f6e8966..66668355 100644
--- a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
+++ b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
@@ -41,6 +41,3 @@ index e95dbf2..709ca6b 100644
cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
sudo pip install -U -r ./fuel-mirror/requirements.txt
sudo pip install ./fuel-mirror
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
index 9edcd2bb..496acf07 100644
--- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -156,6 +156,3 @@ index a9e74bc..0266e17 100755
if [ ! -f $REPO/dists/trusty/Release.backup ]; then
echo "Error - didn't find backup file for Release!"
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0004-Follow-redirects.patch b/patches/opnfv-fuel/0004-Follow-redirects.patch
index d056a9e0..db92ff2c 100644
--- a/patches/opnfv-fuel/0004-Follow-redirects.patch
+++ b/patches/opnfv-fuel/0004-Follow-redirects.patch
@@ -23,6 +23,3 @@ index 01f6e41..61d41ab 100644
export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/$(LATEST_TARGET_CENTOS)/x86_64"
# uncomment and use: make print-VARIABLE
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
index c6820393..1ec568be 100644
--- a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
@@ -22,6 +22,3 @@ index b096a78..744f352 100755
ret=0
fuel notify --topic "done" --send "${bs_done_message}"
else
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
index 253267d1..2300153b 100644
--- a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
+++ b/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
@@ -46,6 +46,3 @@ index aa12c45..2e4843d 100644
direct_repo_addresses:
+ - "ports.ubuntu.com"
- "127.0.0.1"
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
index 130c354d..440d20e5 100644
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
@@ -19,6 +19,3 @@ index e9c4356..c23e9c2 100644
+QEMU_BRANCH:=292b588b5fe444651cca92d7511383ac42253984
+QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
QEMU_CHANGE=
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
index dde9c5a0..c427394f 100644
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
@@ -20,6 +20,3 @@ index 1893fce..f29dab5 100644
+OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
OVSNFV_DPDK_CHANGE=
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
new file mode 100644
index 00000000..dd043892
--- /dev/null
+++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
@@ -0,0 +1,24 @@
+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/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
+index b0bc9c7..cc305e0 100644
+--- a/build/f_isoroot/f_odlpluginbuild/Makefile
++++ b/build/f_isoroot/f_odlpluginbuild/Makefile
+@@ -8,8 +8,8 @@
+ ##############################################################################
+
+ TOP := $(shell pwd)
+-ODL_BRANCH=brahmaputra-release
+-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
++ODL_BRANCH:=brahmaputra-release
++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