f_repos: patch: Rebase patches, cleanup

While at it, re-export patches to remove any redundant info:
$ make patches-export

Change-Id: I4ce3aba9f9d6092bade305a744738c44a936db7c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 58 insertions, 39 deletions

diff --git a/build/f_repos/patch/fuel-library/0002-Rework-processorcount-limits-to-os_workers.patch b/build/f_repos/patch/fuel-library/0002-Rework-processorcount-limits-to-os_workers.patch
index 6b495cbf1..53b1b6009 100644
--- a/build/f_repos/patch/fuel-library/0002-Rework-processorcount-limits-to-os_workers.patch
+++ b/build/f_repos/patch/fuel-library/0002-Rework-processorcount-limits-to-os_workers.patch
@@ -1,4 +1,3 @@
-From 15284786b55e844fcdcc95d5865c91be03871487 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
@@ -10,9 +9,29 @@ Closes-bug: 1629238
 
 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   |  2 +-
+ .../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 +-
+ .../puppet/openstack_tasks/manifests/roles/cinder.pp |  4 ++--
+ .../openstack_tasks/manifests/sahara/sahara.pp       |  4 ++--
+ .../openstack_tasks/manifests/swift/parts/proxy.pp   |  2 +-
+ .../openstack_tasks/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       |  6 +++---
+ 17 files changed, 45 insertions(+), 25 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 36747a61e..502bc94b8 100644
+index 36747a6..502bc94 100644
 --- a/deployment/puppet/openstack/manifests/cinder.pp
 +++ b/deployment/puppet/openstack/manifests/cinder.pp
 @@ -44,7 +44,7 @@ class openstack::cinder(
@@ -25,7 +44,7 @@ index 36747a61e..502bc94b8 100644
    $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 72fbe3271..e6fcf4f88 100644
+index 72fbe32..e6fcf4f 100644
 --- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
 @@ -35,7 +35,7 @@ class openstack_tasks::ceilometer::controller {
@@ -36,9 +55,9 @@ index 72fbe3271..e6fcf4f88 100644
 +  $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 4c951999d..f3a20c5a7 100644
+index bbba7dd..9e9f57c 100644
 --- a/deployment/puppet/openstack_tasks/manifests/glance/glance.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/glance/glance.pp
 @@ -21,7 +21,7 @@ class openstack_tasks::glance::glance {
@@ -51,7 +70,7 @@ index 4c951999d..f3a20c5a7 100644
                                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 1a70af711..824c700bb 100644
+index 1a70af7..824c700 100644
 --- a/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
 @@ -134,7 +134,7 @@ class openstack_tasks::horizon::horizon {
@@ -62,24 +81,24 @@ index 1a70af711..824c700bb 100644
 +    $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 2d26e1f19..6e7d8ca2b 100644
+index 2d26e1f..6e7d8ca 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 0d96b177a..0d3d33bff 100644
+index 8535821..bef595d 100644
 --- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
 @@ -22,7 +22,7 @@ class openstack_tasks::keystone::keystone {
@@ -92,7 +111,7 @@ index 0d96b177a..0d3d33bff 100644
                                  min(max($::processorcount, 2), $workers_max))
    $default_log_levels    = hiera_hash('default_log_levels')
 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 6eccfc37b..644dd2440 100644
+index ec60184..ce03683 100644
 --- a/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/openstack_cinder/openstack_cinder.pp
 @@ -13,7 +13,7 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
@@ -104,9 +123,9 @@ index 6eccfc37b..644dd2440 100644
    $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')
-@@ -84,8 +84,8 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
+@@ -86,8 +86,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)
@@ -114,9 +133,9 @@ index 6eccfc37b..644dd2440 100644
 +  $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 458c34c8f..89fcb20b3 100644
+index 5222a37..38aaa40 100644
 --- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
 @@ -48,7 +48,7 @@ class openstack_tasks::openstack_controller::openstack_controller {
@@ -128,9 +147,9 @@ index 458c34c8f..89fcb20b3 100644
    $service_workers              = pick($nova_hash['workers'],
                                          min(max($::processorcount, 2), $workers_max))
    $compute_nodes                = get_nodes_hash_by_roles($network_metadata, ['compute'])
-@@ -117,8 +117,8 @@ class openstack_tasks::openstack_controller::openstack_controller {
-   })
- 
+@@ -119,8 +119,8 @@ class openstack_tasks::openstack_controller::openstack_controller {
+   $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/')
+
    # 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))
@@ -138,9 +157,9 @@ index 458c34c8f..89fcb20b3 100644
 +  $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 9492493d1..240a378b7 100644
+index fe74bc6..881deda 100644
 --- a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
 @@ -9,7 +9,7 @@ class openstack_tasks::openstack_network::agents::metadata {
@@ -149,29 +168,29 @@ index 9492493d1..240a378b7 100644
    $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 1d5c2d0e1..822e41750 100644
+index 133c49e..4dbbf05 100644
 --- a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
 @@ -64,7 +64,7 @@ class openstack_tasks::openstack_network::server_config {
    $auth_url                = "${internal_auth_protocol}://${internal_auth_endpoint}:35357/"
    $nova_admin_auth_url     = "${admin_auth_protocol}://${admin_auth_endpoint}:35357/"
- 
+
 -  $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 b36619437..b6958b64f 100644
+index da3c148..09c3896 100644
 --- a/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/roles/cinder.pp
 @@ -81,8 +81,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)
@@ -179,9 +198,9 @@ index b36619437..b6958b64f 100644
 +  $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 9d011ceb5..0366659f0 100644
+index 9d011ce..0366659 100644
 --- a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
 +++ b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
 @@ -51,8 +51,8 @@ class openstack_tasks::sahara::sahara {
@@ -194,9 +213,9 @@ index 9d011ceb5..0366659f0 100644
 +    $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 81d64a2d8..8a68acdb3 100644
+index 81d64a2..8a68acd 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 (
@@ -209,7 +228,7 @@ index 81d64a2d8..8a68acdb3 100644
    $proxy_allow_account_management    = true,
    $proxy_account_autocreate          = true,
 diff --git a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
-index a221baf36..77f4ba1a0 100644
+index a221baf..77f4ba1 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 {
@@ -223,7 +242,7 @@ index a221baf36..77f4ba1a0 100644
    $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 000000000..404fb9018
+index 0000000..404fb90
 --- /dev/null
 +++ b/deployment/puppet/osnailyfacter/lib/facter/os_workers.rb
 @@ -0,0 +1,20 @@
@@ -248,7 +267,7 @@ index 000000000..404fb9018
 +  end
 +end
 diff --git a/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp b/deployment/puppet/osnailyfacter/manifests/apache_mpm.pp
-index 51bc3274d..70a654ae2 100644
+index 51bc327..70a654a 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 inherits ::osnailyfacter::apache {
@@ -258,21 +277,21 @@ index 51bc3274d..70a654ae2 100644
 -    $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 99e0fa4cd..2e38b10ee 100644
+index f9e8ccb..6eee21e 100644
 --- a/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
 +++ b/deployment/puppet/osnailyfacter/manifests/globals/globals.pp
-@@ -311,14 +311,14 @@ class osnailyfacter::globals::globals {
+@@ -320,14 +320,14 @@ class osnailyfacter::globals::globals {
    # 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 %>")
 +  $workers_max = inline_template("<%= [(@memorysize_mb.to_i / @workers_ratio.to_i).floor + 1, $::os_workers].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))