From: Steven Hardy <shardy@redhat.com>
Date: Mon, 17 Oct 2016 18:02:41 +0000 (+0100)
Subject: Add apache workers to nova-api conditional
X-Git-Tag: opnfv-6.0.0~1476^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4c500c680a190466fb051c0c2209160db3c9dfcf;p=apex-tripleo-heat-templates.git

Add apache workers to nova-api conditional

Without this httpd fails to start on deployments where the
worker count isn't explicitly overridden via a parameter.

Change-Id: Ie7b31bc6e022a0166af126c866994bdd019718df
Closes-Bug: #1634213
---

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: