diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-04-05 12:33:16 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:21:20 +0000 |
| commit | d12f7200df2887d40fd8102668f7b8b2eaf88a29 (patch) | |
| tree | 78f69433e38a776ecbf87aabd433f20cff3265bc /patches | |
| parent | 9450de982da1506d05d5418ceb6e53398fbd5aa1 (diff) | |
Rebase after upstream bump
(cherry picked from commit 4d4bf7c29530ea85570b30ee9b351bc55825b950)
Change-Id: Ied0b2eba422aa54ecf0d4834f18a583ef0a5ffa9
Diffstat (limited to 'patches')
6 files changed, 8 insertions, 8 deletions
diff --git a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch index a48e925f..33d31ff4 100644 --- a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch +++ b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch @@ -14,7 +14,7 @@ a nice UX addition. diff --git a/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch new file mode 100644 -index 0000000..d33d4ee +index 0000000..c5f8e5a --- /dev/null +++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch @@ -0,0 +1,39 @@ diff --git a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch index b98984a7..571bcb70 100644 --- a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch +++ b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch @@ -19,7 +19,7 @@ Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> diff --git a/deployment/puppet/openstack/files/nova-libvirt-inject.patch b/deployment/puppet/openstack/files/nova-libvirt-inject.patch new file mode 100644 -index 0000000..071aff3 +index 0000000..9cbfe5f --- /dev/null +++ b/deployment/puppet/openstack/files/nova-libvirt-inject.patch @@ -0,0 +1,44 @@ diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch index ef3acc36..56ff4ffc 100644 --- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch @@ -35,7 +35,7 @@ index 16dc3fa..23d6589 100644 class VmwareDeploymentSerializerMixin(object): diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py -index b8b38e2..b76a3d3 100644 +index b8b38e2..d3d03ec 100644 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ b/nailgun/nailgun/orchestrator/deployment_serializers.py @@ -274,6 +274,9 @@ class DeploymentMultinodeSerializer(object): diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch index d30a954c..9ee8ead5 100644 --- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch +++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Allow customizing Fuel commit 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/config.mk b/build/config.mk -index e11d033..2a81027 100644 +index 667575c..30d9ccc 100644 --- a/build/config.mk +++ b/build/config.mk @@ -9,7 +9,7 @@ diff --git a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch index 3c7b1f35..28e6384d 100644 --- a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch +++ b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch @@ -7,15 +7,15 @@ 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 e9c4356..c23e9c2 100644 +index 1f823b6..d19b788 100644 --- a/build/f_isoroot/f_qemupluginbuild/config.mk +++ b/build/f_isoroot/f_qemupluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --QEMU_BRANCH=1eb8bf930e2ec6e64526e95fcb21124f7401a243 +-QEMU_BRANCH=fc2f266fc0986b56deb0b740a5e202205b577a60 -QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu -+QEMU_BRANCH:=1eb8bf930e2ec6e64526e95fcb21124f7401a243 ++QEMU_BRANCH:=fc2f266fc0986b56deb0b740a5e202205b577a60 +QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu QEMU_CHANGE= diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch index dd043892..61ba7e3c 100644 --- a/patches/opnfv-fuel/0008-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 b0bc9c7..cc305e0 100644 +index 3ecf680..b0449d0 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,8 +8,8 @@ |