diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-21 16:13:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-21 16:13:55 +0000 |
| commit | 60750a2e0254a2cac885cfa4cd55ebb518593324 (patch) | |
| tree | e5874304f7b181302f846d04ab9555dd3ec3a835 | |
| parent | 23a1617da9d99c781d27e3292d8722875c101fd3 (diff) | |
| parent | da3b0cb68f5652789e67a82052f5396f4df3531c (diff) | |
Merge "Use ::os_workers fact instead of ::processorcount"
| -rw-r--r-- | puppet/services/cinder-api.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/keystone.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index a48e4681..3c624e3a 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -42,7 +42,7 @@ parameters: CinderWorkers: type: string description: Set the number of workers for cinder::wsgi::apache - default: '"%{::processorcount}"' + default: '"%{::os_workers}"' conditions: cinder_workers_zero: {equals : [{get_param: CinderWorkers}, 0]} diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index d424a0e8..d1765fcc 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -83,7 +83,7 @@ parameters: KeystoneWorkers: type: string description: Set the number of workers for keystone::wsgi::apache - default: '"%{::processorcount}"' + default: '"%{::os_workers}"' MonitoringSubscriptionKeystone: default: 'overcloud-kestone' type: string |