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

15 files changed, 269 insertions, 72 deletions

diff --git a/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch b/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch
new file mode 100644
index 00000000..7f240c8e
--- /dev/null
+++ b/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch
@@ -0,0 +1,21 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 22 Mar 2016 10:54:32 +0100
+Subject: [PATCH] Increase upload_cirros timeout for multi-image
+
+---
+ deployment/puppet/osnailyfacter/modular/astute/tasks.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+index a2cb1da..d9d2dcc 100644
+--- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
++++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+@@ -19,7 +19,7 @@
+     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb
+     retries: 3
+     interval: 20
+-    timeout: 180
++    timeout: 360
+ 
+ - id: upload_nodes_info
+   type: upload_file
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
new file mode 100644
index 00000000..a48e925f
--- /dev/null
+++ b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
@@ -0,0 +1,103 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 22 Mar 2016 12:05:09 +0100
+Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
+
+Nova hardcodes default options for both video=cirrus and console.
+armv7 and aarch64 VMs require video=vga, and since most applications
+use PL011 serial driver for guests, adding console=ttyAMA0 is also
+a nice UX addition.
+---
+ .../openstack/files/nova-libvirt-vga-console.patch | 39 ++++++++++++++++++++++
+ deployment/puppet/openstack/manifests/compute.pp   | 19 +++++++++++
+ 2 files changed, 58 insertions(+)
+ create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+
+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
+--- /dev/null
++++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+@@ -0,0 +1,39 @@
++From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
++Date: Tue, 22 Mar 2016 12:05:09 +0100
++Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
++
++Nova hardcodes default options for both video=cirrus and console.
++armv7 and aarch64 VMs require video=vga, and since most applications
++use PL011 serial driver for guests, adding console=ttyAMA0 is also
++a nice UX addition.
++
++Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++---
++
++diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py
++index 920a283..751b140 100644
++--- a/virt/libvirt/driver.py
+++++ b/virt/libvirt/driver.py
++@@ -3834,7 +3834,11 @@
++         if virt_type == "xen":
++             guest.os_cmdline = "ro root=%s" % root_device_name
++         else:
+++            guestarch = libvirt_utils.get_arch(image_meta)
++             guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE))
+++            if guestarch in (arch.ARMV7, arch.AARCH64):
+++                # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console
+++                guest.os_cmdline += " console=ttyAMA0"
++             if virt_type == "qemu":
++                 guest.os_cmdline += " no_timer_check"
++         if instance.ramdisk_id:
++@@ -3972,7 +3972,8 @@ class LibvirtDriver(driver.ComputeDriver):
++             video.type = 'xen'
++         elif CONF.libvirt.virt_type == 'parallels':
++             video.type = 'vga'
++-        elif guestarch in (arch.PPC, arch.PPC64):
+++        elif guestarch in (arch.ARMV7, arch.AARCH64, arch.PPC, arch.PPC64):
+++            # NOTE(armband): Added ARM v7/v8, same as on PPC.
++             # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default
++             # so use 'vga' instead when running on Power hardware.
++             video.type = 'vga'
+diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
+index c0349dc..46b1801 100644
+--- a/deployment/puppet/openstack/manifests/compute.pp
++++ b/deployment/puppet/openstack/manifests/compute.pp
+@@ -157,6 +157,12 @@ class openstack::compute (
+     }
+   }
+ 
++  if ! defined(Package['patch']) {
++    package { 'patch':
++      ensure => 'present',
++    }
++  }
++
+   $glance_connection = $glance_api_servers
+ 
+   case $::osfamily {
+@@ -250,6 +256,7 @@ class openstack::compute (
+ 
+   $memcached_addresses =  suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>"))
+   $notify_on_state_change = 'vm_and_task_state'
++  $nova_path = '/usr/lib/python2.7/dist-packages/nova'
+ 
+   class { 'nova':
+       install_utilities      => false,
+@@ -273,6 +280,18 @@ class openstack::compute (
+       service_down_time      => $nova_service_down_time,
+       notify_on_state_change => $notify_on_state_change,
+       memcached_servers      => $memcached_addresses,
++  } ->
++  # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
++  file { "${nova_path}/libvirt-vga-console.patch":
++    ensure => "file",
++    source => "puppet:///modules/openstack/nova-libvirt-vga-console.patch",
++  } ->
++  exec { 'nova libvirt driver patch arm defaults':
++    path    => ['/usr/bin'],
++    command => "patch -p1 < ${nova_path}/libvirt-vga-console.patch",
++    unless  => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch",
++    cwd     => $nova_path,
++    require => [Package['patch']],
+   }
+ 
+   if str2bool($::is_virtual) {
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
new file mode 100644
index 00000000..b98984a7
--- /dev/null
+++ b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch
@@ -0,0 +1,92 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 25 Mar 2016 16:12:08 +0100
+Subject: [PATCH] nova: Fix inject for direct boot with part table.
+
+See [1] 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).
+
+[1] https://bugs.launchpad.net/nova/+bug/1290455
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+---
+ .../openstack/files/nova-libvirt-inject.patch      | 44 ++++++++++++++++++++++
+ deployment/puppet/openstack/manifests/compute.pp   | 12 ++++++
+ 2 files changed, 56 insertions(+)
+ create mode 100644 deployment/puppet/openstack/files/nova-libvirt-inject.patch
+
+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
+--- /dev/null
++++ b/deployment/puppet/openstack/files/nova-libvirt-inject.patch
+@@ -0,0 +1,44 @@
++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++Date: Tue, 22 Mar 2016 12:05:09 +0100
++Subject: [PATCH] Fix inject for direct boot with partition table
++
++See [1] 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).
++
++[1] https://bugs.launchpad.net/nova/+bug/1290455
++
++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
++---
++
++diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py
++index 920a283..751b140 100644
++--- a/virt/libvirt/driver.py
+++++ b/virt/libvirt/driver.py
++@@ -34,6 +34,7 @@
++ import mmap
++ import operator
++ import os
+++import re
++ import shutil
++ import tempfile
++ import time
++@@ -2820,7 +2821,15 @@
++         """
++         # Handles the partition need to be used.
++         target_partition = None
++-        if not instance.kernel_id:
+++        image_meta = objects.ImageMeta.from_instance(instance)
+++        # FIXME(armband): https://bugs.launchpad.net/nova/+bug/1290455
+++        # Support direct kernel boot with a partition table inside disk image:
+++        # pass target_partition when root kernel arg points to a partition
+++        # (instead of the whole disk).
+++        has_partition_table = re.search("root=/dev/.d.([1-9]+)",
+++            str(image_meta.properties.get("os_command_line")))
+++
+++        if not instance.kernel_id or has_partition_table:
++             target_partition = CONF.libvirt.inject_partition
++             if target_partition == 0:
++                 target_partition = None
+diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
+index 46b1801..d42d6a1 100644
+--- a/deployment/puppet/openstack/manifests/compute.pp
++++ b/deployment/puppet/openstack/manifests/compute.pp
+@@ -281,6 +281,18 @@ class openstack::compute (
+       notify_on_state_change => $notify_on_state_change,
+       memcached_servers      => $memcached_addresses,
+   } ->
++  # FIXME(armband): Fix inject for part image direct boot (bug LP #1469308)
++  file { "${nova_path}/libvirt-inject.patch":
++    ensure => "file",
++    source => "puppet:///modules/openstack/nova-libvirt-inject.patch",
++  } ->
++  exec { 'nova libvirt driver patch partitioned injection':
++    path    => ['/usr/bin'],
++    command => "patch -p1 < ${nova_path}/libvirt-inject.patch",
++    unless  => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-inject.patch",
++    cwd     => $nova_path,
++    require => [Package['patch']],
++  }
+   # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
+   file { "${nova_path}/libvirt-vga-console.patch":
+     ensure => "file",
diff --git a/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch b/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
new file mode 100644
index 00000000..0d13efeb
--- /dev/null
+++ b/patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch
@@ -0,0 +1,48 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 27 Mar 2016 20:32:50 +0200
+Subject: [PATCH] ceph: Fix obsolete XFS mount param "delaylog".
+
+According to [1], "delaylog" mount arg is now enforced by default,
+and passing it will lead to mount failure.
+
+Trim "delaylog" from default list of xfs mount args and leave it up to
+ceph-osd.pp to add this obsoleted arg only for targets running a kernel
+older than 4.0.
+
+[1] https://www.kernel.org/doc/Documentation/filesystems/xfs.txt
+---
+ deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp   | 7 +++++++
+ deployment/puppet/osnailyfacter/modular/globals/globals.pp | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
+index f7da80e..22aab33 100644
+--- a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
++++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
+@@ -50,6 +50,13 @@ class {'ceph':
+ }
+ 
+ if $ceph_tuning_settings != {} {
++  if versioncmp($::kernelmajversion, '4.0') < 0 {
++    # FIXME(armband): XFS mount opt delaylog is deprecated in kernels >=4.0.
++    $ceph_tuning_settings['osd_mount_options_xfs'] = join([
++      $ceph_tuning_settings['osd_mount_options_xfs'],
++      'delaylog'
++    ], ',')
++  }
+   ceph_conf {
+     'global/debug_default'                    : value => $debug;
+     'global/max_open_files'                   : value => $ceph_tuning_settings['max_open_files'];
+diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
+index 268a5b1..69aed7b 100644
+--- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp
++++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
+@@ -123,7 +123,7 @@ if ($storage_hash['volumes_ceph'] or $storage_hash['images_ceph'] or $storage_ha
+   $ceph_tuning_settings = {
+     'max_open_files'                       => pick($storage_tuning_settings['max_open_files'], '131072'),
+     'osd_mkfs_type'                        => pick($storage_tuning_settings['osd_mkfs_type'], 'xfs'),
+-    'osd_mount_options_xfs'                => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,delaylog,allocsize=4M'),
++    'osd_mount_options_xfs'                => pick($storage_tuning_settings['osd_mount_options_xfs'], 'rw,relatime,inode64,logbsize=256k,allocsize=4M'),
+     'osd_op_threads'                       => pick($storage_tuning_settings['osd_op_threads'], '20'),
+     'filestore_queue_max_ops'              => pick($storage_tuning_settings['filestore_queue_max_ops'], '500'),
+     'filestore_queue_committing_max_ops'   => pick($storage_tuning_settings['filestore_queue_committing_max_ops'], '5000'),
diff --git a/patches/fuel-main/0003-Follow-redirects.patch b/patches/fuel-main/0003-Follow-redirects.patch
deleted file mode 100644
index 17ae85d5..00000000
--- a/patches/fuel-main/0003-Follow-redirects.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Tue, 1 Mar 2016 09:35:24 +0100
-Subject: [PATCH] Follow redirects
-
----
- config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.mk b/config.mk
-index ae4766b..2a99278 100644
---- a/config.mk
-+++ b/config.mk
-@@ -271,7 +271,7 @@ USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES?=
- 
- # If the URL given ended with target.txt then is't a pointer to a snapshot that
- # should be unlinked. If it is not - return it as is.
--expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' && echo "$${url%/*}/$$(curl -sSf $$url | head -1)/x86_64/" || echo $${url})
-+expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' && echo "$${url%/*}/$$(curl -sSfL $$url | head -1)/x86_64/" || echo $${url})
- 
- # Expand repo URLs now
- #MIRROR_CENTOS:=$(call expand_repo_url,$(MIRROR_CENTOS))
diff --git a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch
index 00c2ce41..00c2ce41 100644
--- a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch
+++ b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch
diff --git a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch b/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch
deleted file mode 100644
index ee92f2f1..00000000
--- a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Tue, 1 Mar 2016 11:06:32 +0100
-Subject: [PATCH] Add apt https support package to sandbox
-
----
- sandbox.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sandbox.mk b/sandbox.mk
-index 18757a1..c450d19 100644
---- a/sandbox.mk
-+++ b/sandbox.mk
-@@ -183,7 +183,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
- mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
- cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
- echo "Running qemu-debootstrap"
--sudo qemu-debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
-+sudo qemu-debootstrap --no-check-gpg --include=ca-certificates,apt-transport-https --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
- if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
- sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
- if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
diff --git a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
index e3d13b85..e3d13b85 100644
--- a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
+++ b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
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 bec998f9..ef3acc36 100644
--- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
+++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
@@ -72,7 +72,7 @@ index b8b38e2..b76a3d3 100644
 +        if arch == 'aarch64':
 +            image_data['glance_properties'] += \
 +                ' --property os_command_line=\'root=/dev/vda1 rw rootwait' + \
-+                'console=tty0 console=ttyS0 console=ttyAMA0\'' + \
++                ' console=tty0 console=ttyS0 console=ttyAMA0\'' + \
 +                ' --property hw_video_model=vga'
 +            kernel_data = {
 +                'container_format': 'aki',
@@ -81,7 +81,7 @@ index b8b38e2..b76a3d3 100644
 +                'img_name': 'TestVM-kernel',
 +                'img_path': '{0}cirros-{1}-kernel'.format(img_dir, arch),
 +                'os_name': 'cirros',
-+                'min_ram': 64,
++                'min_ram': 128,
 +                'glance_properties': '',
 +            }
 +            initrd_data = {
@@ -91,7 +91,7 @@ index b8b38e2..b76a3d3 100644
 +                'img_name': 'TestVM-initramfs',
 +                'img_path': '{0}cirros-{1}-initramfs'.format(img_dir, arch),
 +                'os_name': 'cirros',
-+                'min_ram': 64,
++                'min_ram': 128,
 +                'glance_properties': '',
 +            }
 +            images += [kernel_data, initrd_data]
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 @@