From: Alexandru Avadanii Date: Tue, 21 Feb 2017 23:12:48 +0000 (+0100) Subject: f_repos: fuel-library: Sync patch w/ upstream X-Git-Tag: danube.1.RC1~25 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F29179%2F1;p=fuel.git f_repos: fuel-library: Sync patch w/ upstream Adjust patch context after upstream changes merged recently. Change-Id: I341186055e3a77620028ae1bab9cd69c70f87014 Signed-off-by: Alexandru Avadanii --- 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 715cdd33b..b1f1ef432 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 @@ -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