diff options
author | 2016-03-29 15:06:02 +0200 | |
---|---|---|
committer | 2016-05-02 14:16:25 +0000 | |
commit | ca12251eb36ddf1efc4d6bbed37a6e002ae110c2 (patch) | |
tree | 54758b57f5f1bc42f7707c2706f3eeee11b6a51e /patches/opnfv-fuel | |
parent | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (diff) |
Clean up and fix Libvirt and Ceph
[ Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ]
* Fix upload_cirros timeout
* Workaround for default video device in nova
* Fix syntax and increase TestVM's RAM requirements
[ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ]
* Cleanup: Obsolete SEPARATE_IMAGES.
* Nova libvirt drv: arm64: Update console default.
* fuel{,-main}: Cleanup obsolete patches.
* nova: Fix inject for direct boot with part table.
See https://bugs.launchpad.net/nova/+bug/1290455 for full bug
description. For now, we detect direct kernel boot with a partition
table inside disk image by passing target_partition when root kernel
arg points to a partition (instead of the whole disk).
* Drop obsolete/done TODO entries.
* Nova: Fix os cmd line parsing for list case.
* ceph: Fix obsolete XFS mount param.
* Fix out-of-order embedded patch hunks.
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0f762e556ea7b2393f56ca7fb8e06f66f99880aa)
Change-Id: I24f84e8b100b3f1542f9f51db93ebad9831b9b14
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r-- | patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch (renamed from patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0004-Follow-redirects.patch | 25 | ||||
-rw-r--r-- | patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch (renamed from patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch (renamed from patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch) | 2 | ||||
-rw-r--r-- | patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch (renamed from patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch (renamed from patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch) | 2 |
6 files changed, 2 insertions, 27 deletions
diff --git a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch index 1ec568be..1ec568be 100644 --- a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch +++ b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch diff --git a/patches/opnfv-fuel/0004-Follow-redirects.patch b/patches/opnfv-fuel/0004-Follow-redirects.patch deleted file mode 100644 index db92ff2c..00000000 --- a/patches/opnfv-fuel/0004-Follow-redirects.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Tue, 1 Mar 2016 09:34:57 +0100 -Subject: [PATCH] Follow redirects - ---- - build/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/Makefile b/build/Makefile -index 01f6e41..61d41ab 100644 ---- a/build/Makefile -+++ b/build/Makefile -@@ -52,10 +52,10 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | - export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) - - export MIRROR_MOS_UBUNTU := $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3) --export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/8.0.target.txt" | head -1) -+export LATEST_TARGET_UBUNTU := $(shell curl -sSfL "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/8.0.target.txt" | head -1) - export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU) - --export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/os.target.txt" | head -1) -+export LATEST_TARGET_CENTOS := $(shell curl -sSfL "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/os.target.txt" | head -1) - 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 diff --git a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch index 2300153b..2300153b 100644 --- a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch +++ b/patches/opnfv-fuel/0005-bootstrap-Use-public-Ubuntu-ports-mirrors.patch diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch index b34da17b..3c7b1f35 100644 --- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch +++ b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Allow customizing fuel-plugin-qemu 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk -index e4a7d39..3f0107c 100644 +index e9c4356..c23e9c2 100644 --- a/build/f_isoroot/f_qemupluginbuild/config.mk +++ b/build/f_isoroot/f_qemupluginbuild/config.mk @@ -7,6 +7,6 @@ diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch index c427394f..c427394f 100644 --- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch +++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-ovsnfv.patch diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch index 61ba7e3c..dd043892 100644 --- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch @@ -8,7 +8,7 @@ Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index 3ecf680..b0449d0 100644 +index b0bc9c7..cc305e0 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,8 +8,8 @@ |