summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-01-04 15:07:27 -0500
committerEmilien Macchi <emilien@redhat.com>2017-01-04 15:11:04 -0500
commit806fe37b2b63a4af67b82d868401e6e1377ce435 (patch)
treeda9429bbb56d3751fd5391131d42fa62ab3a0467 /puppet
parent4a02aeb22e8f6e27bf8c8ca84422fe9842b8738d (diff)
nova-api: also include hiera for new apache_api class
puppet-nova renamed nova::wsgi::apache to nova::wsgi::apache_api to welcome nova::wsgi::apache_placement (for nova placement API). This patch adds the required parameters before we make the switch in puppet-tripleo. Legacy parameters will be removed when the switch will be done in puppet-tripleo. Change-Id: I5fc99062d349597393e2248c66f2d863029c7730
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/nova-api.yaml17
1 files changed, 14 insertions, 3 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index a4a487cc..747e5333 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -112,14 +112,14 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
- nova::wsgi::apache::ssl: {get_param: EnableInternalTLS}
+ nova::wsgi::apache_api::ssl: {get_param: EnableInternalTLS}
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
# for the given network; replacement examples (eg. for internal_api):
# internal_api -> IP
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
- nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
- nova::wsgi::apache::servername:
+ nova::wsgi::apache_api::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
+ nova::wsgi::apache_api::servername:
str_replace:
template:
"%{hiera('fqdn_$NETWORK')}"
@@ -128,11 +128,22 @@ outputs:
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
nova::api::instance_name_template: {get_param: InstanceNameTemplate}
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
+ # for legacy, will be removed in ocata:
+ nova::wsgi::apache::ssl: {get_param: EnableInternalTLS}
+ nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
+ nova::wsgi::apache::servername:
+ str_replace:
+ template:
+ "%{hiera('fqdn_$NETWORK')}"
+ params:
+ $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
-
if:
- nova_workers_zero
- {}
- nova::api::osapi_compute_workers: {get_param: NovaWorkers}
+ nova::wsgi::apache_api::workers: {get_param: NovaWorkers}
+ # for legacy, will be removed in ocata:
nova::wsgi::apache::workers: {get_param: NovaWorkers}
step_config: |
include tripleo::profile::base::nova::api