summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch60
-rw-r--r--patches/fuel-library/0018-Fix-MySQL-logging-dir-permissions-for-syslog.patch90
-rw-r--r--patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch31
-rw-r--r--patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch6
-rw-r--r--patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch6
-rw-r--r--patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch6
-rw-r--r--patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch14
-rw-r--r--patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch17
-rw-r--r--patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch10
-rw-r--r--patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-some-SE-mirrors.patch (renamed from patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch)13
-rw-r--r--patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch142
m---------upstream/fuel0
m---------upstream/vswitchperf0
13 files changed, 214 insertions, 181 deletions
diff --git a/patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch b/patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch
new file mode 100644
index 00000000..e0704110
--- /dev/null
+++ b/patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch
@@ -0,0 +1,60 @@
+From: dmburmistrov <dmburmistrov@mirantis.com>
+Date: Thu, 18 Aug 2016 21:30:26 +0300
+Subject: Always wait for MySQL sync on service refresh
+
+Always trigger Exec['wait-for-sync'] on
+MySQL service refresh.
+
+Closes-bug: #1614647
+
+Change-Id: I82ec0d46eff217daedc1bd07c67069498c515c44
+---
+ deployment/puppet/cluster/manifests/mysql.pp | 6 +++---
+ deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb | 6 +++++-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/deployment/puppet/cluster/manifests/mysql.pp b/deployment/puppet/cluster/manifests/mysql.pp
+index 0b766c5..055b931 100644
+--- a/deployment/puppet/cluster/manifests/mysql.pp
++++ b/deployment/puppet/cluster/manifests/mysql.pp
+@@ -111,7 +111,7 @@ class cluster::mysql (
+ require => Package['mysql-server'],
+ } ~>
+
+- exec { 'wait-initial-sync':
++ exec { 'wait-for-sync':
+ path => '/bin:/sbin:/usr/bin:/usr/sbin',
+ command => "mysql ${user_password_string} -Nbe \"show status like 'wsrep_local_state_comment'\" | grep -q -e Synced && sleep 10",
+ try_sleep => 10,
+@@ -126,7 +126,7 @@ class cluster::mysql (
+ }
+
+ Exec['create-init-file'] ->
+- Service<| title == $service_name |> ->
+- Exec['wait-initial-sync'] ->
++ Service<| title == $service_name |> ~>
++ Exec['wait-for-sync'] ->
+ Exec['rm-init-file']
+ }
+diff --git a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+index be00056..e4d62c4 100644
+--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+@@ -39,12 +39,16 @@ describe 'cluster::mysql' do
+ /'username'@'localhost' IDENTIFIED BY 'password'/
+ )
+ should contain_exec('create-init-file').that_comes_before('Service[mysqld]')
+- should contain_exec('create-init-file').that_notifies('Exec[wait-initial-sync]')
++ should contain_exec('create-init-file').that_notifies('Exec[wait-for-sync]')
+ end
+
+ it 'creates exec to remove init-file' do
+ should contain_exec('rm-init-file')
+ end
++
++ it 'creates exec to wait initial database sync' do
++ should contain_exec('wait-for-sync').that_subscribes_to('Service[mysqld]')
++ end
+ end
+
+ end
diff --git a/patches/fuel-library/0018-Fix-MySQL-logging-dir-permissions-for-syslog.patch b/patches/fuel-library/0018-Fix-MySQL-logging-dir-permissions-for-syslog.patch
new file mode 100644
index 00000000..da6acac8
--- /dev/null
+++ b/patches/fuel-library/0018-Fix-MySQL-logging-dir-permissions-for-syslog.patch
@@ -0,0 +1,90 @@
+From: Maksim Malchuk <mmalchuk@mirantis.com>
+Date: Wed, 24 Aug 2016 00:15:02 +0300
+Subject: Fix MySQL logging dir permissions for syslog
+
+This change fixes permissions for MySQL logging directory to enable
+syslogd create and write logs files into it.
+
+Closes-Bug: #1615680
+Change-Id: Id29aead6619ea8ed68811d0fd80895ee79f51687
+Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
+(cherry picked from commit 9c978278811eeebfb11ab4d2b42ebabe00c132c2)
+---
+ deployment/puppet/cluster/manifests/mysql.pp | 14 +++++++++++---
+ .../puppet/cluster/spec/classes/cluster_mysql_spec.rb | 11 ++++++++++-
+ tests/noop/spec/hosts/database/database_spec.rb | 9 +++++++++
+ 3 files changed, 30 insertions(+), 4 deletions(-)
+
+diff --git a/deployment/puppet/cluster/manifests/mysql.pp b/deployment/puppet/cluster/manifests/mysql.pp
+index f483cf6..7bc8874 100644
+--- a/deployment/puppet/cluster/manifests/mysql.pp
++++ b/deployment/puppet/cluster/manifests/mysql.pp
+@@ -118,8 +118,16 @@ class cluster::mysql (
+ onlyif => 'test -f /tmp/wsrep-init-file',
+ }
+
++ file { 'fix-log-dir':
++ ensure => directory,
++ path => '/var/log/mysql',
++ mode => '0770',
++ require => Package['mysql-server'],
++ }
++
+ Exec['create-init-file'] ->
+- Service<| title == $service_name |> ~>
+- Exec['wait-for-sync'] ->
+- Exec['rm-init-file']
++ File['fix-log-dir'] ->
++ Service<| title == $service_name |> ~>
++ Exec['wait-for-sync'] ->
++ Exec['rm-init-file']
+ }
+diff --git a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+index 72c8c2f..ad3fc1b 100644
+--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+@@ -33,7 +33,7 @@ describe 'cluster::mysql' do
+ should contain_exec('create-init-file').with_command(
+ /'username'@'localhost' IDENTIFIED BY 'password'/
+ )
+- should contain_exec('create-init-file').that_comes_before('Service[mysqld]')
++ should contain_exec('create-init-file').that_comes_before('File[fix-log-dir]')
+ should contain_exec('create-init-file').that_notifies('Exec[wait-for-sync]')
+ end
+
+@@ -41,6 +41,15 @@ describe 'cluster::mysql' do
+ should contain_exec('rm-init-file')
+ end
+
++ it 'should have correct permissions for logging directory' do
++ should contain_file('fix-log-dir').with(
++ :ensure => 'directory',
++ :path => '/var/log/mysql',
++ :mode => '0770',
++ ).that_requires('Package[mysql-server]')
++ should contain_file('fix-log-dir').that_comes_before('Service[mysqld]')
++ end
++
+ it 'creates exec to wait initial database sync' do
+ should contain_exec('wait-for-sync').that_subscribes_to('Service[mysqld]')
+ end
+diff --git a/tests/noop/spec/hosts/database/database_spec.rb b/tests/noop/spec/hosts/database/database_spec.rb
+index d4ad8d0..2c4c5c5 100644
+--- a/tests/noop/spec/hosts/database/database_spec.rb
++++ b/tests/noop/spec/hosts/database/database_spec.rb
+@@ -261,6 +261,15 @@ describe manifest do
+ )
+ end
+
++ it 'should have correct permissions for logging directory' do
++ should contain_file('fix-log-dir').with(
++ :ensure => 'directory',
++ :path => '/var/log/mysql',
++ :mode => '0770',
++ ).that_requires('Package[mysql-server]')
++ should contain_file('fix-log-dir').that_comes_before('Service[mysqld]')
++ end
++
+ it 'should configure galera grants service and proper flow' do
+ if primary_controller
+ should contain_class('cluster::galera_grants').with(
diff --git a/patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch b/patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch
new file mode 100644
index 00000000..d6ff3818
--- /dev/null
+++ b/patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch
@@ -0,0 +1,31 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 9 Sep 2016 17:55:38 +0200
+Subject: [PATCH] FIXME: deploy: EFI: Skip re-ordering boot via IPMI
+
+On EFI systems deploys, altering the boot order via IPMI causes
+issues on some specific targets. Until we agree on an uniform
+solution for EFI systems + IPMI boot order handling, just skip
+altering it via IPMI.
+
+Related-bug: https://jira.opnfv.org/browse/ARMBAND-71
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ deploy/deploy_env.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py
+index 93dc395..1d2dfeb 100644
+--- a/deploy/deploy_env.py
++++ b/deploy/deploy_env.py
+@@ -255,7 +255,9 @@ class CloudDeploy(object):
+
+ def set_boot_order_nodes(self):
+ self.power_off_nodes()
+- self.set_boot_order(['pxe', 'disk'])
++ # ARMBAND FIXME: See https://jira.opnfv.org/browse/ARMBAND-71
++ # Until we choose an uniform design on EFI systems, just disable it
++ # self.set_boot_order(['pxe', 'disk'])
+ self.power_on_nodes()
+
+ def get_put_deploy_log(self):
diff --git a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
index f66777c7..4daf733e 100644
--- a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
@@ -9,9 +9,9 @@ per supported arch. This requires Fuel refactoring.
build/bootstrap_admin_node.sh.patch | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
---- a/build/bootstrap_admin_node.sh.patch
-+++ b/build/bootstrap_admin_node.sh.patch
+diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
+--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
@@ -53,3 +53,12 @@
# Enable iptables
systemctl enable iptables.service
diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch
index 4023264c..fe623957 100644
--- a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch
+++ b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch
@@ -11,10 +11,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
build/bootstrap_admin_node.sh.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
+diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
index c66b497..46b53e6 100644
---- a/build/bootstrap_admin_node.sh.patch
-+++ b/build/bootstrap_admin_node.sh.patch
+--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
@@ -8,5 +8,20 @@
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
diff --git a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
index 6d55311c..03e877a1 100644
--- a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
+++ b/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch
@@ -30,10 +30,10 @@ Finally, this commit adds an OPNFV post-install script in
2 files changed, 47 insertions(+)
create mode 100755 build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
+diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
index b1ea90b..7f16d0b 100644
---- a/build/bootstrap_admin_node.sh.patch
-+++ b/build/bootstrap_admin_node.sh.patch
+--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
@@ -24,5 +24,18 @@
nodes over PXE, they will be discovered and become available for installing \
OpenStack on them"
diff --git a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch b/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
index 94b3071e..2189b004 100644
--- a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
+++ b/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
@@ -8,14 +8,20 @@ one minute sleep before checking for completition of fuel install.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- deploy/install_fuel_master.py | 2 ++
- 1 file changed, 2 insertions(+)
+ deploy/install_fuel_master.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
-index 808d0b1..404474c 100644
+index 808d0b1..1a7685a 100644
--- a/deploy/install_fuel_master.py
+++ b/deploy/install_fuel_master.py
-@@ -201,6 +201,8 @@ class InstallFuelMaster(object):
+@@ -196,11 +196,13 @@ class InstallFuelMaster(object):
+ self.work_dir, os.path.basename(self.dea_file)))
+
+ def wait_until_installation_completed(self):
+- WAIT_LOOP = 360
++ WAIT_LOOP = 720
+ SLEEP_TIME = 10
CMD = 'ps -ef | grep %s | grep -v grep' % BOOTSTRAP_ADMIN
install_completed = False
diff --git a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
index 675b9815..5dde448f 100644
--- a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
+++ b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch
@@ -8,26 +8,15 @@ Backported from [1].
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- build/Makefile | 1 +
...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++
- 2 files changed, 39 insertions(+)
+ 1 files changed, 38 insertions(+)
create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
-diff --git a/build/Makefile b/build/Makefile
-index d917f26..ec5d27a 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -140,4 +140,5 @@ $(ISOCACHE):
- cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch
-+ cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
- # Repeat build up to three times
- sudo -E ./fuel_build_loop
- cp /tmp/fuel-main/build/artifacts/fuel*.iso .
-diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
+diff --git a/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
new file mode 100644
index 0000000..896f3cf
--- /dev/null
-+++ b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
++++ b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
@@ -0,0 +1,38 @@
+From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
+Date: Fri, 3 Jun 2016 12:26:19 +0200
diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
index df1bd110..fee234d7 100644
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -25,18 +25,16 @@ index 4454c35..377ecc6 100644
############################################################################
# BEGIN of variables to customize
#
-@@ -129,6 +132,9 @@ $(ISOCACHE):
- sudo docker info
- cd /tmp/fuel-main && make repos
- $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt
+@@ -129,5 +132,8 @@ $(ISOCACHE):
+ cd $(FUEL_MAIN_DIR) && make repos
+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt
+ @if test -n $(ARMBAND_BASE); then \
+ $(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \
+ fi
# OPNFV patches at Fuel build time
# Need to be commited in order for them to be considered by the Fuel
# build system
-@@ -228,6 +234,10 @@ debug:
- sha1sum *.patch >> .cachedata
+@@ -228,5 +234,9 @@ debug:
sha1sum fuel_build_loop >> .cachedata
sha1sum config.mk >> .cachedata
+ @if test -n $(ARMBAND_BASE); then \
diff --git a/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch b/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-some-SE-mirrors.patch
index e6e6c2b7..ae247f6f 100644
--- a/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-ftp.acc.umu.se.patch
+++ b/patches/opnfv-fuel/0047-build-ubuntu-mirror-blacklist-some-SE-mirrors.patch
@@ -1,8 +1,11 @@
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 18 Aug 2016 19:21:34 +0200
-Subject: [PATCH] build: ubuntu mirror: blacklist ftp.acc.umu.se
+Subject: [PATCH] build: ubuntu mirror: blacklist some SE mirrors
-Another SE mirror acting up lately ...
+Some SE mirrors are acting up lately, blacklist them:
+- ftp.acc.umu.se
+- ftp.lysator.liu.se
+- ftp.availo.se
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
@@ -13,12 +16,10 @@ diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot
index 4bca6bd..67219cb 100755
--- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
+++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
-@@ -21,7 +21,7 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only"
+@@ -21,5 +21,5 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only"
# Some Ubuntu mirrors seem less reliable for this type of mirroring -
# as they are discoved they can be added to the blacklist below in order
# for them not to be considered.
-BLACKLIST="mirrors.se.eu.kernel.org mirror.its.dal.ca"
-+BLACKLIST="mirrors.se.eu.kernel.org ftp.acc.umu.se mirror.its.dal.ca"
-
- return_url=0
++BLACKLIST="mirrors.se.eu.kernel.org mirror.its.dal.ca ftp.acc.umu.se ftp.lysator.liu.se ftp.availo.se"
diff --git a/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch b/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch
deleted file mode 100644
index 9874c9c2..00000000
--- a/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 27 Aug 2016 17:13:32 +0200
-Subject: [PATCH] build: Move patches to <patch-repos> dir
-
-Decouple main Makefile and repository patches by moving all Fuel
-component patches to a subdir, <patch-repo>.
-
-Proposed structure of <patch-repos> dir:
-- patch-repos/*.patch are intended for <fuel-main> git repo;
-- patch-repos/build/repo/<fuel-module>/*.patch are intended for
- <fuel-module>, e.g. "fuel-nailgun";
-
-Full list of Fuel submodules supported by this mechanism at [1].
-
-While at it, replace all occurences of </tmp/fuel-main> with
-<FUEL_MAIN_DIR> in main Makefile and rewrite a few git/make calls
-to use the "-C" arg.
-
-NOTE: `git -C` is available starting with git 1.8.5.
-
-[1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk
- #L32-L44
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/Makefile | 42 ++++++++++++----------
- .../0010-bootstrap_admin_node.sh.patch} | 0
- .../0020-isolinux.cfg.patch} | 0
- .../0030-repo-multi-arch-local-mirrors.patch} | 0
- ...e-dpkg-checkbuilddeps-with-mk-build-deps.patch} | 0
- ...tel-82599-10-Gigabit-NIC-as-DPDK-capable.patch} | 0
- 6 files changed, 24 insertions(+), 18 deletions(-)
- rename build/{bootstrap_admin_node.sh.patch => patch-repos/0010-bootstrap_admin_node.sh.patch} (100%)
- rename build/{isolinux.cfg.patch => patch-repos/0020-isolinux.cfg.patch} (100%)
- rename build/{repo-multi-arch-local-mirrors.patch => patch-repos/0030-repo-multi-arch-local-mirrors.patch} (100%)
- rename build/{replace-dpkg-checkbuilddeps-with-mk-build-deps.patch => patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch} (100%)
- rename build/{Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch => patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch} (100%)
-
-diff --git a/build/Makefile b/build/Makefile
-index 377ecc6..b234924 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -83,6 +83,11 @@ ORIGDIR := $(TOPDIR)/origiso
- # END of variables to customize
- #############################################################################
-
-+# Fuel-main destination path and fuel-* submodule patching, for full list check:
-+# https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32-L44
-+FUEL_MAIN_DIR := /tmp/fuel-main
-+FUEL_PATCHES := $(shell find $(BUILD_BASE)/patch-repos -name '*.patch' | sort)
-+
- SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
-
- .PHONY: all
-@@ -108,10 +113,10 @@ include cache.mk
-
- $(ISOCACHE):
- # Clone Fuel to non-persistent location and build
-- sudo rm -rf /tmp/fuel-main
-- cd /tmp && git clone $(FUEL_MAIN_REPO)
-- cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
-- @echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE)
-+ sudo rm -rf $(FUEL_MAIN_DIR)
-+ git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR)
-+ git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG)
-+ @echo "fuel" `git -C $(FUEL_MAIN_DIR) rev-parse HEAD` >> $(VERSION_FILE)
- # Remove Docker optimizations, otherwise multistrap will fail during
- # Fuel build.
- sudo rm -f /etc/apt/apt.conf.d/docker*
-@@ -127,25 +132,26 @@ $(ISOCACHE):
- sudo service docker stop || exit 0
- sudo service docker start
-
-- cd /tmp/fuel-main && ./prepare-build-env.sh
-+ cd $(FUEL_MAIN_DIR) && ./prepare-build-env.sh
- # Verify that Docker is alive
- sudo docker info
-- cd /tmp/fuel-main && make repos
-- $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt
-+ # fuel-main Makefiles do not like `make -C`
-+ cd $(FUEL_MAIN_DIR) && make repos
-+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt
- @if test -n $(ARMBAND_BASE); then \
- $(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \
- fi
- # OPNFV patches at Fuel build time
- # Need to be commited in order for them to be considered by the Fuel
- # build system
-- cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
-- cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
-- cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
-- cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch
-- cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
-+ $(foreach patch,$(FUEL_PATCHES),git \
-+ -C $(subst $(BUILD_BASE)/patch-repos,$(FUEL_MAIN_DIR),$(dir $(patch))) \
-+ am --whitespace=nowarn --committer-date-is-author-date $(patch) || \
-+ (echo 'Error: Failed patching Fuel repos!' ; exit 1);)
-+
- # Repeat build up to three times
- sudo -E ./fuel_build_loop
-- cp /tmp/fuel-main/build/artifacts/fuel*.iso .
-+ cp $(FUEL_MAIN_DIR)/build/artifacts/fuel*.iso .
- # Store artifact in cache straight away if caching is enabled
- # (no .cacheid will be present unless this is a cached build)
- test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
-@@ -227,11 +233,11 @@ debug:
- # - The commit ID of the full Fuel repo structre
- # - The contents of all local Fuel patches
- .cacheid:
-- cd /tmp && git clone $(FUEL_MAIN_REPO)
-- cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
-- cd /tmp/fuel-main && make repos
-- $(REPOINFO) -r /tmp/fuel-main > .cachedata
-- sha1sum *.patch >> .cachedata
-+ git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR)
-+ git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG)
-+ make -C $(FUEL_MAIN_DIR) repos
-+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > .cachedata
-+ $(foreach patch,$(FUEL_PATCHES),sha1sum $(patch) >> .cachedata;)
- sha1sum fuel_build_loop >> .cachedata
- sha1sum config.mk >> .cachedata
- @if test -n $(ARMBAND_BASE); then \
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
-similarity index 100%
-rename from build/bootstrap_admin_node.sh.patch
-rename to build/patch-repos/0010-bootstrap_admin_node.sh.patch
-diff --git a/build/isolinux.cfg.patch b/build/patch-repos/0020-isolinux.cfg.patch
-similarity index 100%
-rename from build/isolinux.cfg.patch
-rename to build/patch-repos/0020-isolinux.cfg.patch
-diff --git a/build/repo-multi-arch-local-mirrors.patch b/build/patch-repos/0030-repo-multi-arch-local-mirrors.patch
-similarity index 100%
-rename from build/repo-multi-arch-local-mirrors.patch
-rename to build/patch-repos/0030-repo-multi-arch-local-mirrors.patch
-diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
-similarity index 100%
-rename from build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
-rename to build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch
-diff --git a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
-similarity index 100%
-rename from build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
-rename to build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 5589b0e1659e8e0de0bc1055753685c9fd58f13
+Subproject 243fb3cf924f22cbb3db80c53892f2baef3dd9b
diff --git a/upstream/vswitchperf b/upstream/vswitchperf
-Subproject 6a56d40bcb2de85c22bc19af2527e9c9227f33e
+Subproject acdb444a54124834acdde45107062eaf1452c11