summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-05 17:10:01 +0000
committerGerrit Code Review <review@openstack.org>2017-01-05 17:10:01 +0000
commit16880d541522b006115335ac6729f070dce4b445 (patch)
treea0ad6840a3b38aa4e6505255bb9f2482c01a3ee7 /puppet/services
parenta949d87023d15061182e1959836bcb54690f32d4 (diff)
parentc172a84c950c129fb4bc28c134be55e4021cddf5 (diff)
Merge "nova-api: legacy cleanup with old wsgi params"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/nova-api.yaml11
1 files changed, 0 insertions, 11 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 747e5333..d928e4ea 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -128,23 +128,12 @@ 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
service_config_settings: