f_repos: fuel-library: Sync patch w/ upstream

Adjust patch context after upstream changes merged recently.

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

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 715cdd3..b1f1ef4 100644 (file)
--- 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
@@ -34,15 +34,14 @@ diff --git a/deployment/puppet/openstack/manifests/cinder.pp b/deployment/puppet
 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(
+@@ -44,6 +44,6 @@ 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',
+   $rbd_pool               = 'volumes',
+   $rbd_user               = 'volumes',
 diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
 index 72fbe32..e6fcf4f 100644
 --- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp