Merge "Uplift to Fuel 10.0/Newton"

35 files changed, 137 insertions, 990 deletions

diff --git a/.gitmodules b/.gitmodules
index 84b15ee45..290b74223 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,70 +1,60 @@
 [submodule "fuel-main"]
 	path = build/f_repos/sub/fuel-main
 	url = https://github.com/openstack/fuel-main.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-library"]
 	path = build/f_repos/sub/fuel-library
 	url = https://github.com/openstack/fuel-library.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-web"]
 	path = build/f_repos/sub/fuel-web
 	url = https://github.com/openstack/fuel-web.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "python-fuelclient"]
 	path = build/f_repos/sub/python-fuelclient
 	url = https://github.com/openstack/python-fuelclient.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-agent"]
 	path = build/f_repos/sub/fuel-agent
 	url = https://github.com/openstack/fuel-agent.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-nailgun-agent"]
 	path = build/f_repos/sub/fuel-nailgun-agent
 	url = https://github.com/openstack/fuel-nailgun-agent.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-astute"]
 	path = build/f_repos/sub/fuel-astute
 	url = https://github.com/openstack/fuel-astute.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-ostf"]
 	path = build/f_repos/sub/fuel-ostf
 	url = https://github.com/openstack/fuel-ostf.git
-	branch = stable/mitaka
-        ignore = all
-[submodule "fuel-mirror"]
-	path = build/f_repos/sub/fuel-mirror
-	url = https://github.com/openstack/fuel-mirror.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "fuel-menu"]
 	path = build/f_repos/sub/fuel-menu
 	url = https://github.com/openstack/fuel-menu.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "shotgun"]
 	path = build/f_repos/sub/shotgun
 	url = https://github.com/openstack/shotgun.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
 [submodule "network-checker"]
 	path = build/f_repos/sub/network-checker
 	url = https://github.com/openstack/network-checker.git
-	branch = stable/mitaka
-        ignore = all
-[submodule "fuel-upgrade"]
-	path = build/f_repos/sub/fuel-upgrade
-	url = https://github.com/openstack/fuel-upgrade.git
-	branch = stable/mitaka
+	branch = master
         ignore = all
 [submodule "fuel-ui"]
 	path = build/f_repos/sub/fuel-ui
 	url = https://github.com/openstack/fuel-ui.git
-	branch = stable/mitaka
+	branch = stable/newton
         ignore = all
diff --git a/build/Makefile b/build/Makefile
index fadb8a8ba..e836de117 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -18,7 +18,7 @@ SHELL = /bin/bash
 # BEGIN of variables to customize
 #
 #Input args
-export MOSVERSION = 9.0
+export MOSVERSION = 10.0
 export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
 export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
 export PRODNO ?= "OPNFV_FUEL"
@@ -57,14 +57,14 @@ 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/$(MOSVERSION).target.txt" | head -1)
-# Fuel 9.0
-export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
-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/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
+# Short circuiting normal package selection as this seems currently broken, see
+# hard coding in config.mk
+# 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/$(MOSVERSION).target.txt" | head -1)
+# export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
+# 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/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
+# export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
 
 # uncomment and use: make print-VARIABLE
 #print-%  : ; @echo $* = $($*)
diff --git a/build/config.mk b/build/config.mk
index ab278589e..6297a271e 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -13,12 +13,10 @@
 # remotes, ALL submodules will point to remote branch HEAD).
 # NOTE: Pinning fuel-main or other submodules to a specific commit/tag is
 # done ONLY via git submodules.
-FUEL_MAIN_TAG = 9.0.1
-MOS_VERSION   = 9.0
-OPENSTACK_VERSION = mitaka-9.0
+FUEL_MAIN_TAG = master
+MOS_VERSION   = 10.0
+OPENSTACK_VERSION = newton-10.0
 
-# FIXME(alav): Disable remote tracking for now, stick to submodule commits
-FUEL_TRACK_REMOTES =
 
 ##############################################################################
 # Fuel components pinning / remote tracking; use submodules from f_repos
@@ -34,6 +32,24 @@ F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
 # fuel-main repo location used by main Makefile ISO building, use submodule
 FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
 
+
+
+# Settings for Fuel 10 BEGIN
+#
+# Currently it seems impossible to build Fuel 10 from upstream without
+# hard coding specific repositories. The Fuel Ubuntu mirror seems to not
+# have been fully populated.
+
+export MIRROR_UBUNTU?=cz.archive.ubuntu.com
+export MIRROR_UBUNTU_ROOT?=/ubuntu/
+export MIRROR_MOS_UBUNTU?=mirror.seed-cz1.fuel-infra.org
+export MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/xenial//snapshots/master-2016-10-10-100022
+export MIRROR_CENTOS?=http://mirror.seed-cz1.fuel-infra.org/pkgs/snapshots/centos-7.2.1511-2016-08-07-170016
+export MIRROR_FUEL?=http://mirror.seed-cz1.fuel-infra.org//mos-repos/centos/mos-master-centos7//snapshots/os-2016-10-18-120021/x86_64
+export MIRROR_MOS_UBUNTU_SUITE?=mos-master
+
+# Settings for Fuel 10 END
+
 export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
 export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
 export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient
@@ -41,11 +57,9 @@ export FUEL_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-agent
 export FUEL_NAILGUN_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-nailgun-agent
 export ASTUTE_REPO?=${F_SUBMOD_DIR}/fuel-astute
 export OSTF_REPO?=${F_SUBMOD_DIR}/fuel-ostf
-export FUEL_MIRROR_REPO?=${F_SUBMOD_DIR}/fuel-mirror
 export FUELMENU_REPO?=${F_SUBMOD_DIR}/fuel-menu
 export SHOTGUN_REPO?=${F_SUBMOD_DIR}/shotgun
 export NETWORKCHECKER_REPO?=${F_SUBMOD_DIR}/network-checker
-export FUELUPGRADE_REPO?=${F_SUBMOD_DIR}/fuel-upgrade
 export FUEL_UI_REPO?=${F_SUBMOD_DIR}/fuel-ui
 
 # OPNFV tags are automatically applied by `make -C f_repos patches-import`
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 1539783c9..db85916c5 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,23 +9,24 @@
 ##############################################################################
 
 # Add Fuel plugin build targets here
-# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
+# Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild f_tacker-pluginbuild
-#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
+PLUGINS = 
 export PLUGINS
-#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
+NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
 
 # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
 # indicated therein.
 # Temporarilu disabling f_repobuild that currently have some issues on
-# Fuel Mitaka.
+# Fuel Newton.
 ifdef BUILD_FUEL_PLUGINS
 export BUILD_FUEL_PLUGINS
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
+#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
+SUBDIRS = f_kscfg f_bootstrap f_isolinux $(BUILD_FUEL_PLUGINS)
 $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
 else
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
+#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
+SUBDIRS = f_kscfg f_bootstrap f_isolinux $(PLUGINS)
 endif
 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
 
diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index b5eafff9b..f09dbedd1 100644
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -35,7 +35,9 @@ include ../config.mk
 # To enable remote tracking, set the following var to any non-empty string.
 # Leaving this var empty will bind each git submodule to its saved commit.
 # NOTE: For non-stable branches, unless overriden, always track remotes
-FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
+# Need to disable this logic temporarily as Newton doesn't seem to have stable
+# branches in all repos. /Stefan
+# FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
 
 .PHONY: all
 all: release
diff --git a/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch b/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch
deleted file mode 100644
index e51e70b64..000000000
--- a/build/f_repos/patch/fuel-library/0001-Reduce-ceilometer-memory-usage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Thu, 8 Sep 2016 19:25:14 +0300
-Subject: [PATCH] Reduce ceilometer memory usage
-
-Change-Id: I8b1a97bd710c859a3543d1aed8226313f35f4f10
----
- .../puppet/openstack_tasks/manifests/ceilometer/controller.pp      | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-index 2c63ff0..1dda109 100644
---- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-@@ -234,5 +234,12 @@ class openstack_tasks::ceilometer::controller {
-         Ceilometer_config<| title == 'oslo_messaging_rabbit/kombu_compression' |> { value => $kombu_compression }
-       }
-     }
-+
-+    # Reduce memory usage
-+    ceilometer_config {
-+      'DEFAULT/executor_thread_pool_size':               value => ceiling($service_workers*0.5);
-+      'notification/pipeline_processing_queues':         value => ceiling($service_workers*1.5);
-+      'oslo_messaging_rabbit/rabbit_qos_prefetch_count': value => 5;
-+    }
-   }
- }
diff --git a/build/f_repos/patch/fuel-library/0002-Disable-token-revoke-to-increase-keystone-performanc.patch b/build/f_repos/patch/fuel-library/0002-Disable-token-revoke-to-increase-keystone-performanc.patch
deleted file mode 100644
index d4baa9c1e..000000000
--- a/build/f_repos/patch/fuel-library/0002-Disable-token-revoke-to-increase-keystone-performanc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: iberezovskiy <iberezovskiy@mirantis.com>
-Date: Mon, 19 Sep 2016 12:35:05 +0300
-Subject: [PATCH] Disable token revoke to increase keystone performance
-
-Change-Id: I4df816369093908ad1eac372f38c92155efbe8e0
-Closes-bug: #1625077
----
- deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp | 2 ++
- tests/noop/spec/hosts/keystone/keystone_spec.rb                  | 5 +++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-index 3162287..ba9d7df 100644
---- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-@@ -327,6 +327,8 @@ class openstack_tasks::keystone::keystone {
-       memcache_pool_unused_timeout => '60',
-       cache_memcache_servers       => $memcache_servers,
-       policy_driver                => 'keystone.policy.backends.sql.Policy',
-+      # Set revoke_by_id to false according to LP #1625077
-+      revoke_by_id                 => false,
-     }
-
-     Package<| title == 'keystone'|> ~> Service<| title == 'keystone'|>
-diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
-index b29e691..3c0f847 100644
---- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
-+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
-@@ -176,6 +176,11 @@ describe manifest do
-         should contain_class('keystone').with('sync_db' => primary_controller)
-     end
-
-+    it 'should declare keystone class with revoke_by_id set to false' do
-+      # Set revoke_by_id to false according to LP #1625077
-+      should contain_class('keystone').with('revoke_by_id' => false)
-+    end
-+
-     it 'should configure keystone with paramters' do
-       should contain_keystone_config('token/caching').with(:value => 'false')
-       should contain_keystone_config('cache/enabled').with(:value => 'true')
diff --git a/build/f_repos/patch/fuel-library/0003-Rework-processorcount-limits-to-os_workers.patch b/build/f_repos/patch/fuel-library/0003-Rework-processorcount-limits-to-os_workers.patch
deleted file mode 100644
index cc961222c..000000000
--- a/build/f_repos/patch/fuel-library/0003-Rework-processorcount-limits-to-os_workers.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From feb6582408ed13ec34e0f6450af121f5614d5dfb Mon Sep 17 00:00:00 2001
-From: Bogdan Dobrelya <bdobrelia@mirantis.com>
-Date: Fri, 30 Sep 2016 12:03:34 +0200
-Subject: [PATCH] Rework processorcount limits to os_workers
-
-* reduce workers_max default limits of a 16 to the $::os_workers, which is limited by [2, 8] interval.
-* reduce workers/pool size/overflow limited by F($::processorcount) to F($::os_workers)
-* change number of keystone threads to 1
-
-Closes-bug: #1629238
-Closes-Bug: #1628534
-
-Change-Id: I5cc4d70b902eeaa1c9cf42911606eba13dd84aa2
-Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
----
- deployment/puppet/openstack/manifests/cinder.pp    |    2 +-
- .../manifests/ceilometer/controller.pp             |    2 +-
- .../openstack_tasks/manifests/glance/glance.pp     |    2 +-
- .../openstack_tasks/manifests/horizon/horizon.pp   |    2 +-
- .../manifests/ironic/ironic_compute.pp             |    4 ++--
- .../openstack_tasks/manifests/keystone/keystone.pp |    4 ++--
- .../manifests/openstack_cinder/openstack_cinder.pp |    6 +++---
- .../openstack_controller/openstack_controller.pp   |    6 +++---
- .../manifests/openstack_network/agents/metadata.pp |    2 +-
- .../manifests/openstack_network/server_config.pp   |    2 +-
- .../openstack_tasks/manifests/roles/cinder.pp      |    4 ++--
- .../openstack_tasks/manifests/sahara/sahara.pp     |    4 ++--
- .../openstack_tasks/manifests/swift/parts/proxy.pp |    4 ++--
- .../manifests/swift/proxy_storage.pp               |    2 +-
- .../puppet/osnailyfacter/lib/facter/os_workers.rb  |   20 ++++++++++++++++++++
- .../puppet/osnailyfacter/manifests/apache_mpm.pp   |    2 +-
- .../osnailyfacter/manifests/globals/globals.pp     |    8 ++++----
- .../spec/classes/osnailyfacter_atop_spec.rb        |    2 ++
- .../noop/spec/hosts/ironic/ironic-compute_spec.rb  |    6 +++---
- tests/noop/spec/hosts/keystone/keystone_spec.rb    |    2 ++
- .../openstack-controller_spec.rb                   |    6 +++---
- tests/noop/spec/hosts/sahara/sahara_spec.rb        |    6 +++---
- 22 files changed, 61 insertions(+), 37 deletions(-)
- create mode 100644 deployment/puppet/osnailyfacter/lib/facter/os_workers.rb
-
-diff --git a/deployment/puppet/openstack/manifests/cinder.pp b/deployment/puppet/openstack/manifests/cinder.pp
-index 072252e..3cdf077 100644
---- a/deployment/puppet/openstack/manifests/cinder.pp
-+++ b/deployment/puppet/openstack/manifests/cinder.pp
-@@ -44,7 +44,7 @@ class openstack::cinder(
-   $keystone_user          = 'cinder',
-   $region                 = 'RegionOne',
-   $notification_driver    = undef,
--  $service_workers        = $::processorcount,
-+  $service_workers        = $::os_workers,
-   $vmware_host_ip         = '10.10.10.10',
-   $vmware_host_username   = 'administrator@vsphere.local',
-   $vmware_host_password   = 'password',
-diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-index 2c63ff0..d0ce24d 100644
---- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
-@@ -37,7 +37,7 @@ class openstack_tasks::ceilometer::controller {
-   $service_endpoint           = hiera('service_endpoint', $management_vip)
-   $ha_mode                    = pick($ceilometer_hash['ha_mode'], true)
-   $ssl_hash                   = hiera_hash('use_ssl', {})
--  $workers_max                = hiera('workers_max', 16)
-+  $workers_max                = hiera('workers_max', $::os_workers)
-   $service_workers            = pick($ceilometer_hash['workers'],
-   min(max($::processorcount, 2), $workers_max))
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/glance/glance.pp b/deployment/puppet/openstack_tasks/manifests/glance/glance.pp
-index ab7cc13..99153a0 100644
---- a/deployment/puppet/openstack_tasks/manifests/glance/glance.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/glance/glance.pp
-@@ -22,7 +22,7 @@ class openstack_tasks::glance::glance {
-   $max_overflow          = hiera('max_overflow')
-   $ceilometer_hash       = hiera_hash('ceilometer', {})
-   $region                = hiera('region','RegionOne')
--  $workers_max           = hiera('workers_max', 16)
-+  $workers_max         = hiera('workers_max', $::os_workers)
-   $service_workers       = pick($glance_hash['glance_workers'],
-                                 min(max($::processorcount, 2), $workers_max))
-   $ironic_hash           = hiera_hash('ironic', {})
-diff --git a/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp b/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
-index ca1ef45..a52106f 100644
---- a/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
-@@ -119,7 +119,7 @@ class openstack_tasks::horizon::horizon {
-     $wsgi_processes = 2
-     $wsgi_threads = 9
-   } else {
--    $wsgi_processes = $::processorcount
-+    $wsgi_processes = $::os_workers
-     $wsgi_threads = 15
-   }
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp b/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp
-index 940c7a3..322e703 100644
---- a/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp
-@@ -35,8 +35,8 @@ class openstack_tasks::ironic::ironic_compute {
-   $db_name                        = pick($nova_hash['db_name'], 'nova')
-   $db_password                    = pick($nova_hash['db_password'], 'nova')
- 
--  $max_pool_size = hiera('max_pool_size', min($::processorcount * 5 + 0, 30 + 0))
--  $max_overflow = hiera('max_overflow', min($::processorcount * 5 + 0, 60 + 0))
-+  $max_pool_size = hiera('max_pool_size', min($::os_workers * 5 + 0, 30 + 0))
-+  $max_overflow = hiera('max_overflow', min($::os_workers * 5 + 0, 60 + 0))
-   $idle_timeout = hiera('idle_timeout', '3600')
-   $max_retries = hiera('max_retries', '-1')
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-index 3162287..8146548 100644
---- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
-@@ -30,7 +30,7 @@ class openstack_tasks::keystone::keystone {
-   $syslog_log_facility   = hiera('syslog_log_facility_keystone')
-   $rabbit_hash           = hiera_hash('rabbit', {})
-   $neutron_user_password = hiera('neutron_user_password', false)
--  $workers_max           = hiera('workers_max', 16)
-+  $workers_max           = hiera('workers_max', $::os_workers)
-   $service_workers       = pick($keystone_hash['workers'],
-                                 min(max($::processorcount, 2), $workers_max))
-   $default_log_levels    = hiera_hash('default_log_levels')
-@@ -151,7 +151,7 @@ class openstack_tasks::keystone::keystone {
- 
-   class { '::keystone::wsgi::apache':
-     priority              => '05',
--    threads               => 3,
-+    threads               => 1,
-     workers               => min($::processorcount, 6),
-     ssl                   => $ssl,
-     vhost_custom_fragment => $vhost_limit_request_field_size,
-diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp b/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
-index a298e70..cc4c2b3 100644
---- a/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
-@@ -12,7 +12,7 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
-   $sahara_hash            = hiera_hash('sahara', {})
-   $rabbit_hash            = hiera_hash('rabbit', {})
-   $service_endpoint       = hiera('service_endpoint')
--  $workers_max            = hiera('workers_max', 16)
-+  $workers_max            = hiera('workers_max', $::os_workers)
-   $service_workers        = pick($cinder_hash['workers'], min(max($::processorcount, 2), $workers_max))
-   $cinder_user_password   = $cinder_hash[user_password]
-   $keystone_user          = pick($cinder_hash['user'], 'cinder')
-@@ -98,8 +98,8 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
-   }
- 
-   # SQLAlchemy backend configuration
--  $max_pool_size = min($::processorcount * 5 + 0, 30 + 0)
--  $max_overflow = min($::processorcount * 5 + 0, 60 + 0)
-+  $max_pool_size = min($::os_workers * 5 + 0, 30 + 0)
-+  $max_overflow = min($::os_workers * 5 + 0, 60 + 0)
-   $max_retries = '-1'
-   $idle_timeout = '3600'
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
-index f8915c1..dbc7a9e 100644
---- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
-@@ -56,7 +56,7 @@ class openstack_tasks::openstack_controller::openstack_controller {
-   $keystone_user                = pick($nova_hash['user'], 'nova')
-   $keystone_tenant              = pick($nova_hash['tenant'], 'services')
-   $region                       = hiera('region', 'RegionOne')
--  $workers_max                  = hiera('workers_max', 16)
-+  $workers_max                  = hiera('workers_max', $::os_workers)
-   $service_workers              = pick($nova_hash['workers'],
-                                         min(max($::processorcount, 2), $workers_max))
-   $compute_nodes                = get_nodes_hash_by_roles($network_metadata, ['compute'])
-@@ -127,8 +127,8 @@ class openstack_tasks::openstack_controller::openstack_controller {
-   })
- 
-   # SQLAlchemy backend configuration
--  $max_pool_size = hiera('max_pool_size', min($::processorcount * 5 + 0, 30 + 0))
--  $max_overflow = hiera('max_overflow', min($::processorcount * 5 + 0, 60 + 0))
-+  $max_pool_size = hiera('max_pool_size', min($::os_workers * 5 + 0, 30 + 0))
-+  $max_overflow = hiera('max_overflow', min($::os_workers * 5 + 0, 60 + 0))
-   $idle_timeout = hiera('idle_timeout', '3600')
-   $max_retries = hiera('max_retries', '-1')
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
-index 98acddb..9efcb5a 100644
---- a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
-@@ -10,7 +10,7 @@ class openstack_tasks::openstack_network::agents::metadata {
-   $neutron_advanced_config  = hiera_hash('neutron_advanced_configuration', { })
-   $neutron_config           = hiera_hash('neutron_config')
-   $dvr                      = pick($neutron_advanced_config['neutron_dvr'], false)
--  $workers_max              = hiera('workers_max', 16)
-+  $workers_max              = hiera('workers_max', $::os_workers)
- 
-   if $compute {
-     $metadata_workers = pick($neutron_config['workers'],
-diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
-index 414eedf..03d03a8 100644
---- a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
-@@ -86,7 +86,7 @@ class openstack_tasks::openstack_network::server_config {
-     $nova_admin_auth_url     = "${admin_auth_protocol}://${admin_auth_endpoint}:35357/"
-     $nova_url                = "${nova_internal_protocol}://${nova_internal_endpoint}:8774/v2"
- 
--    $workers_max             = hiera('workers_max', 16)
-+    $workers_max             = hiera('workers_max', $::os_workers)
-     $service_workers         = pick($neutron_config['workers'], min(max($::processorcount, 1), $workers_max))
- 
-     $neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
-diff --git a/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp b/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp
-index f2d6c72..c41dae6 100644
---- a/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp
-@@ -86,8 +86,8 @@ class openstack_tasks::roles::cinder {
-   }
- 
-   # SQLAlchemy backend configuration
--  $max_pool_size = min($::processorcount * 5 + 0, 30 + 0)
--  $max_overflow = min($::processorcount * 5 + 0, 60 + 0)
-+  $max_pool_size = min($::os_workers * 5 + 0, 30 + 0)
-+  $max_overflow = min($::os_workers * 5 + 0, 60 + 0)
-   $max_retries = '-1'
-   $idle_timeout = '3600'
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
-index f6d50c6..30278ee 100644
---- a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
-@@ -52,8 +52,8 @@ class openstack_tasks::sahara::sahara {
-     $sahara_user     = pick($sahara_hash['user'], 'sahara')
-     $sahara_password = pick($sahara_hash['user_password'])
-     $tenant          = pick($sahara_hash['tenant'], 'services')
--    $max_pool_size   = min($::processorcount * 5 + 0, 30 + 0)
--    $max_overflow    = min($::processorcount * 5 + 0, 60 + 0)
-+    $max_pool_size   = min($::os_workers * 5 + 0, 30 + 0)
-+    $max_overflow    = min($::os_workers * 5 + 0, 60 + 0)
-     $max_retries     = '-1'
-     $idle_timeout    = '3600'
- 
-diff --git a/deployment/puppet/openstack_tasks/manifests/swift/parts/proxy.pp b/deployment/puppet/openstack_tasks/manifests/swift/parts/proxy.pp
-index eb06244..52c2b3a 100644
---- a/deployment/puppet/openstack_tasks/manifests/swift/parts/proxy.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/swift/parts/proxy.pp
-@@ -26,7 +26,7 @@ class openstack_tasks::swift::parts::proxy (
-     'account_quotas',
-     'slo',
-     'proxy-server'],
--  $proxy_workers                     = $::processorcount,
-+  $proxy_workers                     = $::os_workers,
-   $proxy_port                        = '8080',
-   $proxy_allow_account_management    = true,
-   $proxy_account_autocreate          = true,
-@@ -225,4 +225,4 @@ class openstack_tasks::swift::parts::proxy (
-     anchor { 'openstack_tasks_proxy_end' :}
- 
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
-index 66fcd21..4608b67 100644
---- a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
-@@ -30,7 +30,7 @@ class openstack_tasks::swift::proxy_storage {
-   $keystone_user              = pick($swift_hash['user'], 'swift')
-   $keystone_password          = pick($swift_hash['user_password'], 'passsword')
-   $keystone_tenant            = pick($swift_hash['tenant'], 'services')
--  $workers_max                = hiera('workers_max', 16)
-+  $workers_max                = hiera('workers_max', $::os_workers)
-   $service_workers            = pick($swift_hash['workers'], min(max($::processorcount, 2), $workers_max))
-   $ssl_hash                   = hiera_hash('use_ssl', {})
-   $rabbit_hash                = hiera_hash('rabbit')
-diff --git a/deployment/puppet/osnailyfacter/lib/facter/os_workers.rb b/deployment/puppet/osnailyfacter/lib/facter/os_workers.rb
-new file mode 100644
-index 0000000..404fb90
---- /dev/null
-+++ b/deployment/puppet/osnailyfacter/lib/facter/os_workers.rb
-@@ -0,0 +1,20 @@
-+#
-+# We've found that using $::processorcount for workers/threads can lead to
-+# unexpected memory or process counts for people deploying on baremetal or
-+# if they have large number of cpus. This fact allows us to tweak the formula
-+# used to determine number of workers in a single place but use it across all
-+# modules.
-+#
-+# The value for os_workers is max between '(<# processors> / 4)' and '2' with
-+# a cap of 8.
-+#
-+# This fact can be overloaded by an external fact from /etc/factor/facts.d if
-+# a user would like to provide their own default value.
-+#
-+Facter.add(:os_workers) do
-+  has_weight 100
-+  setcode do
-+    processors = Facter.value('processorcount')
-+    [ [ (processors.to_i / 4), 2 ].max, 8 ].min
-+  end
-+end
-diff --git a/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp b/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp
-index 9d0d4d5..9652064 100644
---- a/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp
-+++ b/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp
-@@ -11,7 +11,7 @@ class osnailyfacter::apache_mpm {
-   if $::processorcount <= 2 {
-     $startservers = 2
-   } else {
--    $startservers = $::processorcount
-+    $startservers = $::os_workers
-   }
- 
-   $maxrequestsperchild = 0
-diff --git a/deployment/puppet/osnailyfacter/manifests/globals/globals.pp b/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
-index 854d297..c4d1cf7 100644
---- a/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
-+++ b/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
-@@ -323,15 +323,15 @@ class osnailyfacter::globals::globals {
-   # More services share the same node, more RAM ratio should be given to the workers.
-   # The default value assumes there are 20 different types of workers limited by 100Mb each.
-   $workers_ratio = hiera('workers_ratio', 2000)
--  # Defines the maximum allowed number of workers for each service by RAM limits. Cannot exceed the value of 30.
--  $workers_max = inline_template("<%= [(@memorysize_mb.to_i / @workers_ratio.to_i).floor + 1, 30].min %>")
-+  # Defines the maximum allowed number of workers for each service by RAM limits. Cannot exceed the value of 10.
-+  $workers_max = inline_template("<%= [(@memorysize_mb.to_i / @workers_ratio.to_i).floor + 1, 10].min %>")
- 
-   $node_name_prefix_for_messaging = hiera('node_name_prefix_for_messaging', 'messaging-')
- 
-   # MySQL and SQLAlchemy backend configuration
-   $custom_mysql_setup_class = hiera('custom_mysql_setup_class', 'galera')
--  $max_pool_size            = hiera('max_pool_size', min($::processorcount * 5 + 0, 30 + 0))
--  $max_overflow             = hiera('max_overflow', min($::processorcount * 5 + 0, 60 + 0))
-+  $max_pool_size            = hiera('max_pool_size', min($::os_workers * 5 + 0, 30 + 0))
-+  $max_overflow             = hiera('max_overflow', min($::os_workers * 5 + 0, 60 + 0))
-   $max_retries              = hiera('max_retries', '-1')
-   $idle_timeout             = hiera('idle_timeout','3600')
-   $nova_db_password         = $nova_hash['db_password']
-diff --git a/deployment/puppet/osnailyfacter/spec/classes/osnailyfacter_atop_spec.rb b/deployment/puppet/osnailyfacter/spec/classes/osnailyfacter_atop_spec.rb
-index ed57325..1d27e87 100644
---- a/deployment/puppet/osnailyfacter/spec/classes/osnailyfacter_atop_spec.rb
-+++ b/deployment/puppet/osnailyfacter/spec/classes/osnailyfacter_atop_spec.rb
-@@ -73,6 +73,7 @@ describe 'osnailyfacter::atop' do
-         :osfamily        => 'Debian',
-         :operatingsystem => 'Debian',
-         :processorcount  => 2,
-+        :os_workers      => 2,
-         :memorysize_mb   => 4096,
-       }
-     end
-@@ -86,6 +87,7 @@ describe 'osnailyfacter::atop' do
-         :osfamily        => 'RedHat',
-         :operatingsystem => 'RedHat',
-         :processorcount  => 2,
-+        :os_workers      => 2,
-         :memorysize_mb   => 4096,
-       }
-     end
-diff --git a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
-index 4712298..f7c7512 100644
---- a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
-+++ b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
-@@ -122,11 +122,11 @@ describe manifest do
-         else
-           extra_params = '?charset=utf8'
-         end
--        facts[:processorcount] = 10
--        max_overflow = Noop.hiera 'max_overflow', [facts[:processorcount] * 5 + 0, 60 + 0].min
-+        facts[:os_workers] = 8
-+        max_overflow = Noop.hiera 'max_overflow', [facts[:os_workers] * 5 + 0, 60 + 0].min
-         idle_timeout = Noop.hiera 'idle_timeout', '3600'
-         max_retries = Noop.hiera 'max_retries', '-1'
--        max_pool_size = Noop.hiera 'max_pool_size', [facts[:processorcount] * 5 + 0, 30 + 0].min
-+        max_pool_size = Noop.hiera 'max_pool_size', [facts[:os_workers] * 5 + 0, 30 + 0].min
- 
-         should contain_class('nova').with(
-           :database_connection    => "mysql://#{nova_db_user}:#{nova_db_password}@#{database_vip}/#{nova_db_name}#{extra_params}",
-diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
-index b29e691..c258104 100644
---- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
-+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
-@@ -220,6 +220,7 @@ describe manifest do
- 
-      it 'should declare keystone::wsgi::apache class with 6 processes and 3 threads on 48 CPU system' do
-        facts[:processorcount] = 48
-+       facts[:os_workers] = 8
-        should contain_class('keystone::wsgi::apache').with(
-          'threads' => '3',
-          'workers' => '6'
-@@ -228,6 +229,7 @@ describe manifest do
- 
-      it 'should declare keystone::wsgi::apache class with 1 process and 3 threads on 1 CPU system' do
-        facts[:processorcount] = 1
-+       facts[:os_workers] = 2
-        should contain_class('keystone::wsgi::apache').with(
-          'threads' => '3',
-          'workers' => '1'
-diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
-index f5f273b..efd2acb 100644
---- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
-+++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
-@@ -208,9 +208,9 @@ describe manifest do
-     end
- 
-     it 'should configure nova with the basics' do
--      facts[:processorcount] = 10
--      max_pool_size = Noop.hiera 'max_pool_size', [facts[:processorcount] * 5 + 0, 30 + 0].min
--      max_overflow = Noop.hiera 'max_overflow', [facts[:processorcount] * 5 + 0, 60 + 0].min
-+      facts[:os_workers] = 10
-+      max_pool_size = Noop.hiera 'max_pool_size', [facts[:os_workers] * 5 + 0, 30 + 0].min
-+      max_overflow = Noop.hiera 'max_overflow', [facts[:os_workers] * 5 + 0, 60 + 0].min
-       idle_timeout = Noop.hiera 'idle_timeout', '3600'
-       max_retries = Noop.hiera 'max_retries', '-1'
- 
-diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb
-index 2d15c23..2d07680 100644
---- a/tests/noop/spec/hosts/sahara/sahara_spec.rb
-+++ b/tests/noop/spec/hosts/sahara/sahara_spec.rb
-@@ -91,7 +91,7 @@ describe manifest do
-     enable = Noop.hiera_structure('sahara/enabled')
-     context 'if sahara is enabled', :if => enable do
-       it 'should declare sahara class correctly' do
--        facts[:processorcount] = 10
-+        facts[:os_workers] = 8
-         sahara_plugins = %w(ambari cdh mapr spark vanilla)
-         sahara_user = Noop.hiera_structure('sahara/user', 'sahara')
-         sahara_password = Noop.hiera_structure('sahara/user_password')
-@@ -101,8 +101,8 @@ describe manifest do
-         db_name = Noop.hiera_structure('sahara/db_name', 'sahara')
-         db_password = Noop.hiera_structure('sahara/db_password')
-         db_host = Noop.hiera_structure('sahara/db_host', database_vip)
--        max_pool_size =[facts[:processorcount] * 5 + 0, 30 + 0].min
--        max_overflow = [facts[:processorcount] * 5 + 0, 60 + 0].min
-+        max_pool_size =[facts[:os_workers] * 5 + 0, 30 + 0].min
-+        max_overflow = [facts[:os_workers] * 5 + 0, 60 + 0].min
-         max_retries  = '-1'
-         idle_timeout = '3600'
-         read_timeout = '60'
--- 
-1.7.9.5
-
diff --git a/build/f_repos/patch/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch b/build/f_repos/patch/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch
deleted file mode 100644
index fd929323f..000000000
--- a/build/f_repos/patch/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 60dbecc548b4a81b99d50feac96864ed42d9af4b Mon Sep 17 00:00:00 2001
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Wed, 26 Oct 2016 15:26:11 +0300
-Subject: [PATCH] Shift public ping checker into deployment stage
-
-Avoid public vip failover at the end of post-deployment
-by moving ping_checker resource into deployment stage.
-Also pingd constraint has been changed to be based on score.
-If all the nodes failed to ping the default gw, the resource
-ain't stopped and remains on the last node where it was.
-
-Change-Id: I666fbbbe98d000c66f97cf4751f304a2da9aad67
----
- .../puppet/cluster/manifests/virtual_ip_ping.pp    |   10 +++----
- .../puppet/osnailyfacter/modular/astute/tasks.yaml |   15 ----------
- .../osnailyfacter/modular/virtual_ips/tasks.yaml   |   30 ++++++++++++++++++++
- 3 files changed, 35 insertions(+), 20 deletions(-)
-
-diff --git a/deployment/puppet/cluster/manifests/virtual_ip_ping.pp b/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
-index 3e49c09..7642422 100644
---- a/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
-+++ b/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
-@@ -11,7 +11,7 @@ define cluster::virtual_ip_ping (
-   $parameters         = {
-     'host_list'  => $host_list,
-     'multiplier' => '1000',
--    'dampen'     => '30s',
-+    'dampen'     => '45s',
-     'timeout'    => '3s',
-   }
-   $operations         = {
-@@ -41,16 +41,16 @@ define cluster::virtual_ip_ping (
-     primitive => $vip_name,
-     rules     => [
-       {
--        'score'   => '-inf',
-+        'score'   => '50',
-         'expressions' => [
-           {
-             'attribute' => "pingd",
--            'operation' => 'not_defined',
-+            'operation' => 'defined',
-           },
-           {
-             'attribute' => "pingd",
--            'operation'=>'lte',
--            'value' => '0',
-+            'operation'=>'gte',
-+            'value' => '1',
-           },
-         ],
-       },
-diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
-index 5e3e6ee..83242c4 100644
---- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
-+++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
-@@ -10,7 +10,6 @@
-   cross-depends:
-     - name: dns-client
-     - name: ntp-server
--    - name: public_vip_ping
-   parameters:
-     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/enable_quorum.rb
-     timeout: 180
-@@ -110,20 +109,6 @@
-     timeout: 180
-     cwd: /
- 
--- id: public_vip_ping
--  type: puppet
--  version: 2.1.0
--  role: [primary-controller, controller]
--  requires: [post_deployment_start]
--  required_for: [post_deployment_end]
--  condition:
--    yaql_exp: "changed($.network_scheme) or changed($.get('run_ping_checker'))"
--  parameters:
--    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
--    puppet_modules: /etc/puppet/modules
--    timeout: 3600
--    cwd: /
--
- - id: configure_default_route
-   type: puppet
-   version: 2.1.0
-diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml b/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
-index 00d4306..7420099 100644
---- a/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
-+++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
-@@ -34,3 +34,33 @@
-     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/virtual_ips/conntrackd_pre.rb
-   test_post:
-     cmd: ruby /etc/puppet/modules/osnailyfacter/modular/virtual_ips/conntrackd_post.rb
-+
-+- id: primary_public_vip_ping
-+  type: puppet
-+  version: 2.1.0
-+  groups: [primary-controller]
-+  requires: [virtual_ips]
-+  required_for: [primary-cluster-haproxy]
-+  condition:
-+    yaql_exp: &pub_viping "changed($.network_scheme) or changed($.get('run_ping_checker'))"
-+  parameters:
-+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
-+    puppet_modules: /etc/puppet/modules
-+    timeout: 300
-+    cwd: /
-+
-+- id: public_vip_ping
-+  type: puppet
-+  version: 2.1.0
-+  groups: [controller]
-+  requires: [virtual_ips]
-+  required_for: [deploy_end]
-+  condition:
-+    yaql_exp: *pub_viping
-+  cross-depends:
-+    - name: primary_public_vip_ping
-+  parameters:
-+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
-+    puppet_modules: /etc/puppet/modules
-+    timeout: 300
-+    cwd: /
--- 
-1.7.9.5
-
diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
deleted file mode 100644
index 446d0b6bd..000000000
--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Mon, 13 Jun 2016 22:23:57 +0200
-Subject: [PATCH] OPNFV: Additions to bootstrap_admin_node.sh
-
----
- iso/bootstrap_admin_node.sh | 39 +++++++++++++++++++++++++++++++--------
- 1 file changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
-index 3197c91..db3123d 100755
---- a/iso/bootstrap_admin_node.sh
-+++ b/iso/bootstrap_admin_node.sh
-@@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
- set +x
- echo "Done!"
-
-+### OPNFV addition BEGIN
-+shopt -s nullglob
-+for script in /opt/opnfv/bootstrap/pre.d/*.sh
-+do
-+  echo "Pre script: $script" >> /root/pre.log 2>&1
-+  $script >> /root/pre.log 2>&1
-+done
-+shopt -u nullglob
-+### OPNFV addition END
-+
-+# Enable sshd
-+systemctl enable sshd
-+systemctl start sshd
-+
- if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
--  fuelmenu || fail
-+  fuelmenu
- else
-   # Give user 15 seconds to enter fuelmenu or else continue
-   echo
-@@ -360,9 +374,10 @@ else
-   fi
- fi
-
-+# OPNFV: Disabled to speedup installation in offline env.
- # Enable online base MOS repos (security, updates) if we run an ISO installation
--[ -f /etc/fuel_build_id ] && \
--  yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
-+#[ -f /etc/fuel_build_id ] && \
-+#  yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
-
- if [ ! -f "${ASTUTE_YAML}" ]; then
-   echo ${fuelmenu_fail_message}
-@@ -377,9 +392,7 @@ if [ ! -f /etc/fuel_build_id ]; then
-   ln -s ${wwwdir}/${OPENSTACK_VERSION}/ubuntu ${wwwdir}/ubuntu
- fi
-
--# Enable sshd
--systemctl enable sshd
--systemctl start sshd
-+systemctl reload sshd
-
- # Enable iptables
- systemctl enable iptables.service
-@@ -532,6 +545,16 @@ systemctl start ntpd
-
- bash /etc/rc.local
-
-+### OPNFV addition BEGIN
-+shopt -s nullglob
-+for script in /opt/opnfv/bootstrap/post.d/*.sh
-+do
-+  echo "Post script: $script" >> /root/post.log 2>&1
-+  $script >> /root/post.log 2>&1
-+done
-+shopt -u nullglob
-+### OPNFV addition END
-+
- if [ "`get_bootstrap_skip`" = "False" ]; then
-   build_ubuntu_bootstrap bs_status || true
- else
-@@ -540,8 +563,8 @@ else
- fi
-
- #Check if repo is accessible
--echo "Checking for access to updates repository..."
--repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl" && $3 ~ "updates") print $3}' | head -1)
-+echo "Checking for access to updates repository/mirrorlist..."
-+repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl|mirrors" && $3 ~ "updates") print $3}' | head -1)
- if urlaccesscheck check "$repourl" ; then
-   UPDATE_ISSUES=0
- else
diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
new file mode 100644
index 000000000..820e387d0
--- /dev/null
+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
@@ -0,0 +1,64 @@
+From: "Stefan K. Berg" <sfb@consultron.com>
+Date: Fri, 4 Nov 2016 16:06:42 +0100
+Subject: [PATCH] Patches for OPNFV
+
+---
+ iso/bootstrap_admin_node.sh | 30 +++++++++++++++++++++++++++---
+ 1 file changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
+index dbcac5f..1826390 100755
+--- a/iso/bootstrap_admin_node.sh
++++ b/iso/bootstrap_admin_node.sh
+@@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
+ set +x
+ echo "Done!"
+ 
++### OPNFV addition BEGIN
++shopt -s nullglob
++for script in /opt/opnfv/bootstrap/pre.d/*.sh
++do
++  echo "Pre script: $script" >> /root/pre.log 2>&1
++  $script >> /root/pre.log 2>&1
++done
++shopt -u nullglob
++
++# Enable sshd
++systemctl enable sshd
++systemctl start sshd
++
++### OPNFV addition END
++
+ if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
+-  fuelmenu || fail
++  fuelmenu
+ else
+   # Give user 15 seconds to enter fuelmenu or else continue
+   echo
+@@ -386,8 +401,7 @@ if [ ! -f /etc/fuel_build_id ]; then
+ fi
+ 
+ # Enable sshd
+-systemctl enable sshd
+-systemctl start sshd
++systemctl reload sshd
+ 
+ # Enable iptables
+ systemctl enable iptables.service
+@@ -546,6 +560,16 @@ systemctl start ntpd
+ 
+ bash /etc/rc.local
+ 
++### OPNFV addition BEGIN
++shopt -s nullglob
++for script in /opt/opnfv/bootstrap/post.d/*.sh
++do
++  echo "Post script: $script" >> /root/post.log 2>&1
++  $script >> /root/post.log 2>&1
++done
++shopt -u nullglob
++### OPNFV addition END
++
+ if [ "`get_bootstrap_skip`" = "False" ]; then
+   build_ubuntu_bootstrap bs_status || true
+ else
diff --git a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch b/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch
deleted file mode 100644
index dbff8c7d4..000000000
--- a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Mon, 13 Jun 2016 22:23:57 +0200
-Subject: [PATCH] OPNFV: showmenu=yes in isolinux.cfg
-
----
- iso/isolinux/isolinux.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/iso/isolinux/isolinux.cfg b/iso/isolinux/isolinux.cfg
-index c6b1ed9..77a4b18 100644
---- a/iso/isolinux/isolinux.cfg
-+++ b/iso/isolinux/isolinux.cfg
-@@ -19,9 +19,9 @@ label nailgun
-   menu label ^1. Fuel Install (Static IP)
-   menu default
-   kernel vmlinuz
--  append initrd=initrd.img net.ifnames=0 biosdevname=0 inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: nameserver=10.20.0.1
-+  append initrd=initrd.img net.ifnames=0 biosdevname=0 inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: nameserver=10.20.0.1 showmenu=yes
-
- label nailgunifname
-   menu label ^2. Fuel Advanced Install (Static IP)
-   kernel vmlinuz
--  append initrd=initrd.img inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: nameserver=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX
-+  append initrd=initrd.img inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: nameserver=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX showmenu=yes
diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
deleted file mode 100644
index 9469643c3..000000000
--- a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Date: Thu, 25 Feb 2016 13:31:19 +0100
-Subject: [PATCH] repo mirror: Allow multi-arch local mirrors
-
-This patch allows specifying multiple architectures via UBUNTU_ARCH in
-form of a list of space separated architectures. The first architecture
-in the list is considered primary and will be used for building all the
-deb packages by fuel-main. Additional architectures are added to allow
-targets of other architectures to use the mirror.
-NOTE: this imposes a requirement that all packages built are arch
-independent (which is true so far).
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- config.mk               | 2 +-
- mirror/ubuntu/module.mk | 2 +-
- sandbox.mk              | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index 74ee039..45a3b30 100644
---- a/config.mk
-+++ b/config.mk
-@@ -49,7 +49,7 @@ UBUNTU_MINOR:=04
- UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
- UBUNTU_KERNEL_FLAVOR?=lts-trusty
- UBUNTU_NETBOOT_FLAVOR?=netboot
--UBUNTU_ARCH:=amd64
-+UBUNTU_ARCH?=amd64
- UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
- SEPARATE_IMAGES?=/boot,ext2 /,ext4
-
-diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
-index 7a9466e..fe1ada2 100644
---- a/mirror/ubuntu/module.mk
-+++ b/mirror/ubuntu/module.mk
-@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done:
- 	--root=$(MIRROR_MOS_UBUNTU_ROOT) \
- 	--dist=$(MIRROR_MOS_UBUNTU_SUITE) \
- 	--section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
--	--arch=$(UBUNTU_ARCH) \
-+	--arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \
- 	$(LOCAL_MIRROR_UBUNTU)/
- 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
- 	$(ACTION.TOUCH)
-diff --git a/sandbox.mk b/sandbox.mk
-index 4bc3962..5ffddbd 100644
---- a/sandbox.mk
-+++ b/sandbox.mk
-@@ -188,7 +188,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 debootstrap"
--sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
-+sudo 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)
- 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/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch
deleted file mode 100644
index 734523040..000000000
--- a/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Artem Silenkov <asilenkov@mirantis.com>
-Date: Tue, 22 Sep 2015 21:54:44 +0300
-Subject: [PATCH] xorriso fails to add files with path longer then 240
-
-joliet-long option added to xorriso command line
-
-Change-Id: I97016cf3e6a554f44d839740ba7d210337435cdc
-Related-Bug: #1498619
----
- iso/module.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iso/module.mk b/iso/module.mk
-index 8995378..0073068 100644
---- a/iso/module.mk
-+++ b/iso/module.mk
-@@ -174,6 +174,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
- 		-V $(ISO_VOLUME_ID) -p $(ISO_VOLUME_PREP) \
- 		-J -R \
- 		-graft-points \
-+		-joliet-long \
- 		-b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
- 		-isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
- 		-eltorito-alt-boot -e images/efiboot.img -no-emul-boot \
diff --git a/build/f_repos/patch/fuel-mirror/0001-Fixed-handling-http-redirects.patch b/build/f_repos/patch/fuel-mirror/0001-Fixed-handling-http-redirects.patch
deleted file mode 100644
index b82be1128..000000000
--- a/build/f_repos/patch/fuel-mirror/0001-Fixed-handling-http-redirects.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Bulat Gaifullin <bgaifullin@mirantis.com>
-Date: Fri, 24 Jun 2016 15:52:41 +0200
-Subject: [PATCH] Fixed handling http redirects
-
-Override method 'redirect_request' for patching
-new request, that has been created on handling
-http redirect.
-
-Change-Id: I40db406e2377bebec1113639b91a0b5262e2e9ad
-Closes-Bug: 1593674
-(cherry picked from commit 192a3d9f8f993afb12c5108dd9339c6688c23e11)
----
- packetary/library/connections.py    | 21 ++++++++++++++++++++-
- packetary/tests/test_connections.py | 19 +++++++++++++++++++
- 2 files changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/packetary/library/connections.py b/packetary/library/connections.py
-index 36a7a84..49b6c9b 100644
---- a/packetary/library/connections.py
-+++ b/packetary/library/connections.py
-@@ -93,9 +93,23 @@ class ResumableResponse(StreamWrapper):
-                 self.stream = response.stream
-
-
--class RetryHandler(urllib.BaseHandler):
-+class RetryHandler(urllib.HTTPRedirectHandler):
-     """urllib Handler to add ability for retrying on server errors."""
-
-+    def redirect_request(self, req, fp, code, msg, headers, newurl):
-+        new_req = urllib.HTTPRedirectHandler.redirect_request(
-+            self, req, fp, code, msg, headers, newurl
-+        )
-+        if new_req is not None:
-+            # We use class assignment for casting new request to type
-+            # RetryableRequest
-+            new_req.__class__ = RetryableRequest
-+            new_req.retries_left = req.retries_left
-+            new_req.offset = req.offset
-+            new_req.start_time = req.start_time
-+            new_req.retry_interval = req.retry_interval
-+        return new_req
-+
-     @staticmethod
-     def http_request(request):
-         """Initialises http request.
-@@ -118,6 +132,11 @@ class RetryHandler(urllib.BaseHandler):
-         :return: ResumableResponse if success otherwise same response
-         """
-         code, msg = response.getcode(), response.msg
-+
-+        if 300 <= code < 400:
-+            # the redirect group, pass to next handler as is
-+            return response
-+
-         # the server should response partial content if range is specified
-         if request.offset > 0 and code != 206:
-             raise RangeError(msg)
-diff --git a/packetary/tests/test_connections.py b/packetary/tests/test_connections.py
-index a2621c8..c80b03d 100644
---- a/packetary/tests/test_connections.py
-+++ b/packetary/tests/test_connections.py
-@@ -268,6 +268,25 @@ class TestRetryHandler(base.TestCase):
-         self.handler.http_response(request, response_mock)
-         self.handler.parent.open.assert_called_once_with(request)
-
-+    @mock.patch(
-+        'packetary.library.connections.urllib.'
-+        'HTTPRedirectHandler.redirect_request'
-+    )
-+    def test_redirect_request(self, redirect_mock, _):
-+        redirect_mock.return_value = connections.urllib.Request(
-+            'http://localhost/'
-+        )
-+        req = mock.MagicMock(retries_left=10, retry_interval=5, offset=100)
-+        new_req = self.handler.redirect_request(req, -1, 301, "", {}, "")
-+        self.assertIsInstance(new_req, connections.RetryableRequest)
-+        self.assertEqual(req.retries_left, new_req.retries_left)
-+        self.assertEqual(req.retry_interval, new_req.retry_interval)
-+        self.assertEqual(req.offset, new_req.offset)
-+        redirect_mock.return_value = None
-+        self.assertIsNone(
-+            self.handler.redirect_request(req, -1, 301, "", {}, "")
-+        )
-+
-
- class TestResumeableResponse(base.TestCase):
-     def setUp(self):
diff --git a/build/f_repos/patch/fuel-web/0001-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/f_repos/patch/fuel-web/0001-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
deleted file mode 100644
index 6fa1e436c..000000000
--- a/build/f_repos/patch/fuel-web/0001-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Wed, 3 Aug 2016 09:41:21 +0200
-Subject: [PATCH] Mark Intel 82599 10 Gigabit NIC as DPDK capable
-
-This NIC is used on Ericsson POD2 but Fuel doesn't allow to activate
-DPDK on it.
----
- nailgun/nailgun/fixtures/openstack.yaml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index 74fa509..d08a4fc 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2213,7 +2213,7 @@
-           "15ad:07b0", "8086:15a5", "1137:0043", "1137:0071", "14e4:168a",
-           "14e4:16a9", "14e4:164f", "14e4:168e", "14e4:16af", "14e4:163d",
-           "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
--          "14e4:16ae", "14e4:163e", "14e4:16a4"
-+          "14e4:16ae", "14e4:163e", "14e4:16a4", "8086:10f8"
-         ]
- - pk: 3
-   extend: *ubuntu_release
diff --git a/build/f_repos/sub/fuel-agent b/build/f_repos/sub/fuel-agent
-Subproject 7ffbf39caf5845bd82b8ce20a7766cf24aa803f
+Subproject 075fc9e2572330416ec0aad45bce969baa43b4f
diff --git a/build/f_repos/sub/fuel-astute b/build/f_repos/sub/fuel-astute
-Subproject 390b257240d49cc5e94ed5c4fcd940b5f2f6ec6
+Subproject bca595a964e4f45798f393bb0bbc685605cae09
diff --git a/build/f_repos/sub/fuel-library b/build/f_repos/sub/fuel-library
-Subproject e283b62750d9e26355981b3ad3be7c880944ae0
+Subproject 2cd11d3a506f9039b7bfd2f3b720df7f1244df9
diff --git a/build/f_repos/sub/fuel-main b/build/f_repos/sub/fuel-main
-Subproject d6a22557d132c592b18c6bac90f5f4b8d1aa3ad
+Subproject 70749a24518b98e1162d60abdcd2c25c9ffa92e
diff --git a/build/f_repos/sub/fuel-menu b/build/f_repos/sub/fuel-menu
-Subproject 0ed9e206ed1c6271121d3acf52a6bf757411286
+Subproject 1a94d657ecaca4a1b549141ee22e5bc7ca20822
diff --git a/build/f_repos/sub/fuel-mirror b/build/f_repos/sub/fuel-mirror
deleted file mode 160000
-Subproject d1ef06b530ce2149230953bb3810a88ecaff870
diff --git a/build/f_repos/sub/fuel-nailgun-agent b/build/f_repos/sub/fuel-nailgun-agent
-Subproject 46fa0db0f8944f9e67699d281d462678aaf4db2
+Subproject af1e5da094c2975230da29f808b26645231841d
diff --git a/build/f_repos/sub/fuel-ostf b/build/f_repos/sub/fuel-ostf
-Subproject f09c98ff7cc71ee612b2450f68a19f2f9c64345
+Subproject ddd691205d7dccfc9a9b52cc2681cdb367c82d2
diff --git a/build/f_repos/sub/fuel-ui b/build/f_repos/sub/fuel-ui
-Subproject 90de7ef4477230cb7335453ed26ed4306ca6f04
+Subproject 2a22c985eeeb3adf2a18f3f56abdcc841caab25
diff --git a/build/f_repos/sub/fuel-upgrade b/build/f_repos/sub/fuel-upgrade
deleted file mode 160000
-Subproject c1c4bac6a467145ac4fac73e4a7dd2b00380ecf
diff --git a/build/f_repos/sub/fuel-web b/build/f_repos/sub/fuel-web
-Subproject e2b85bafb68c348f25cb7cceda81edc668ba2e6
+Subproject 118b9231a48f9341d72990ab3cc65f375d2423c
diff --git a/build/f_repos/sub/network-checker b/build/f_repos/sub/network-checker
-Subproject fcb47dd095a76288aacf924de574e39709e1f3c
+Subproject 5efbc91a120ae3dc12e8751ba4bdf2644590939
diff --git a/build/f_repos/sub/python-fuelclient b/build/f_repos/sub/python-fuelclient
-Subproject 67d8c693a670d27c239d5d175f3ea2a0512c498
+Subproject 870261942796f367ec046341ba095f7ac518f40
diff --git a/build/f_repos/sub/shotgun b/build/f_repos/sub/shotgun
-Subproject 781a8cfa0b6eb290e730429fe2792f2b6f5e0c1
+Subproject 43b5d6d905b1179fd36fa26255d58dc0113b388
diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
index edcb1f2a4..0f03305b6 100644
--- a/build/install/apt-ftparchive-deb.conf
+++ b/build/install/apt-ftparchive-deb.conf
@@ -17,7 +17,7 @@ TreeDefault {
 };
 
 BinDirectory "pool/main" {
-  Packages "dists/mos9.0/main/binary-amd64/Packages";
+  Packages "dists/mos10.0/main/binary-amd64/Packages";
 };
 
 Default {
diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf
index e40ff68b4..4425f2e34 100644
--- a/build/install/apt-ftparchive-release.conf
+++ b/build/install/apt-ftparchive-release.conf
@@ -9,10 +9,10 @@
 ##############################################################################
 
 APT::FTPArchive::Release::Origin "Mirantis";
-APT::FTPArchive::Release::Label "mos9.0";
-APT::FTPArchive::Release::Suite "mos9.0";
-APT::FTPArchive::Release::Version "14.04";
-APT::FTPArchive::Release::Codename "mos9.0";
+APT::FTPArchive::Release::Label "mos10.0";
+APT::FTPArchive::Release::Suite "mos10.0";
+APT::FTPArchive::Release::Version "16.04";
+APT::FTPArchive::Release::Codename "mos10.0";
 APT::FTPArchive::Release::Architectures "amd64";
 APT::FTPArchive::Release::Components "main";
-APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS";
+APT::FTPArchive::Release::Description "Ubuntu 16.04.1 LTS";
diff --git a/build/install/install.sh b/build/install/install.sh
index d1a49f35f..198f26cb5 100755
--- a/build/install/install.sh
+++ b/build/install/install.sh
@@ -390,6 +390,7 @@ copy_packages() {
     if [ -f $TOP/patch-packages/release/patch-replacements ]; then
         echo "Applying package patches" | tee -a $REPORTFILE
         pushd $REPO/pool/main > /dev/null
+	echo "CM: I am now in $(pwd)"
         printf "\n\n" | tee -a  $REPORTFILE
         for line in `cat $TOP/patch-packages/release/patch-replacements`
         do
@@ -447,8 +448,10 @@ copy_packages() {
     # /^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml
     # cp ubuntu-versions.yaml $DEST
 
-    apt-ftparchive -c "${APT_REL_CONF}" release dists/mos9.0/ > dists/mos9.0/Release
-    gzip -9cf dists/mos9.0/Release > dists/mos9.0/Release.gz
+    echo apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release
+    apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release
+    echo gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz
+    gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz
 
     popd > /dev/null
 
diff --git a/build/patch-packages/cirros_testvm/Makefile b/build/patch-packages/cirros_testvm/Makefile
index 4cbe13f6c..b6a56d4d0 100644
--- a/build/patch-packages/cirros_testvm/Makefile
+++ b/build/patch-packages/cirros_testvm/Makefile
@@ -23,7 +23,7 @@ clean:
 
 .PHONY: release
 release:
-	../tools/deb_unpack c/cirros-testvm/cirros-testvm_0.3.4-2~u14.04+mos5_amd64.deb $(ORIGISO)
+	../tools/deb_unpack c/cirros-testvm/cirros-testvm_0.3.4-2~u16.04+mos5_amd64.deb $(ORIGISO)
 	@rm -rf package/usr/share/cirros-testvm/*
 	wget -O package/usr/share/cirros-testvm/cirros-x86_64-disk.img http://download.cirros-cloud.net/daily/20160722/cirros-d160722-x86_64-disk.img
 	../tools/deb_pack $(REVSTATE)
diff --git a/deploy/transplant_fuel_settings.py b/deploy/transplant_fuel_settings.py
index 993b0dcce..ee915fdbe 100644
--- a/deploy/transplant_fuel_settings.py
+++ b/deploy/transplant_fuel_settings.py
@@ -94,7 +94,8 @@ def transplant_bootstrap(astute, fuel_bootstrap_cli):
 def main():
     dea_file = parse_arguments()
     check_file_exists(ASTUTE_YAML)
-    check_file_exists(FUEL_BOOTSTRAP_CLI_YAML)
+    # Temporarily disabled for Fuel 10.
+    # check_file_exists(FUEL_BOOTSTRAP_CLI_YAML)
     dea = DeploymentEnvironmentAdapter(dea_file)
     log('Reading astute file %s' % ASTUTE_YAML)
     with io.open(ASTUTE_YAML) as stream:
@@ -105,11 +106,12 @@ def main():
         yaml.dump(astute, stream, default_flow_style=False)
     log('Transplant done')
     # Update bootstrap config yaml with info from DEA/astute.yaml
-    with io.open(FUEL_BOOTSTRAP_CLI_YAML) as stream:
-        fuel_bootstrap_cli = yaml.load(stream)
-    transplant_bootstrap(astute, fuel_bootstrap_cli)
-    with io.open(FUEL_BOOTSTRAP_CLI_YAML, 'w') as stream:
-        yaml.dump(fuel_bootstrap_cli, stream, default_flow_style=False)
+    # Temporarily disabled for Fuel 10.
+    # with io.open(FUEL_BOOTSTRAP_CLI_YAML) as stream:
+    #     fuel_bootstrap_cli = yaml.load(stream)
+    # transplant_bootstrap(astute, fuel_bootstrap_cli)
+    # with io.open(FUEL_BOOTSTRAP_CLI_YAML, 'w') as stream:
+    #     yaml.dump(fuel_bootstrap_cli, stream, default_flow_style=False)
 
 
 if __name__ == '__main__':