summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-18 12:50:14 +0000
committerGerrit Code Review <review@openstack.org>2016-10-18 12:50:14 +0000
commit2775cc735c4beae67043e0d6b33ef29a1136614f (patch)
treed40a755743b3c9451beb5522d4f2bcda56ec9911
parent01452606a4f92b666b8ca24e2fe8ac76d975c711 (diff)
parent4c500c680a190466fb051c0c2209160db3c9dfcf (diff)
Merge "Add apache workers to nova-api conditional"
-rw-r--r--puppet/services/nova-api.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index a12742ff..6ac287a8 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -117,7 +117,6 @@ outputs:
'"%{::fqdn_$NETWORK}"'
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
- nova::wsgi::apache::workers: {get_param: NovaWorkers}
nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
nova::api::instance_name_template: {get_param: InstanceNameTemplate}
@@ -127,6 +126,7 @@ outputs:
- nova_workers_zero
- {}
- nova::api::osapi_compute_workers: {get_param: NovaWorkers}
+ nova::wsgi::apache::workers: {get_param: NovaWorkers}
step_config: |
include tripleo::profile::base::nova::api
service_config_settings: