openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable internal TLS for Nova API"

Browse Source
This commit is contained in:
Jenkins
2016-11-09 13:30:18 +00:00
committed by Gerrit Code Review
parent 465324cb6a 65db3743ab
commit f118fc0619
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
puppet/services/nova-api.yaml
View File

@@ -51,6 +51,9 @@ parameters:
default: default:
tag: openstack.nova.api tag: openstack.nova.api
path: /var/log/nova/nova-api.log path: /var/log/nova/nova-api.log
EnableInternalTLS:
type: boolean
default: false
conditions: conditions:
nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
@@ -62,6 +65,7 @@ resources:
ServiceNetMap: {get_param: ServiceNetMap} ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords} DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap} EndpointMap: {get_param: EndpointMap}
EnableInternalTLS: {get_param: EnableInternalTLS}
NovaBase: NovaBase:
type: ./nova-base.yaml type: ./nova-base.yaml
@@ -101,21 +105,26 @@ outputs:
nova::api::default_floating_pool: 'public' nova::api::default_floating_pool: 'public'
nova::api::sync_db_api: true nova::api::sync_db_api: true
nova::api::enable_proxy_headers_parsing: true nova::api::enable_proxy_headers_parsing: true
nova::api::api_bind_address:
str_replace:
template:
'"%{::fqdn_$NETWORK}"'
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
nova::wsgi::apache::ssl: {get_param: EnableInternalTLS}
# NOTE: bind IP is found in Heat replacing the network name with the local node IP # 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): # for the given network; replacement examples (eg. for internal_api):
# internal_api -> IP # internal_api -> IP
# internal_api_uri -> [IP] # internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR # internal_api_subnet - > IP/CIDR
nova::api::api_bind_address: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
nova::wsgi::apache::ssl: false
nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]} nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::wsgi::apache::servername: nova::wsgi::apache::servername:
str_replace: str_replace:
template: template:
'"%{::fqdn_$NETWORK}"' '"%{::fqdn_$NETWORK}"'
params: params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
nova::api::instance_name_template: {get_param: InstanceNameTemplate} nova::api::instance_name_template: {get_param: InstanceNameTemplate}
nova_enable_db_purge: {get_param: NovaEnableDBPurge} nova_enable_db_purge: {get_param: NovaEnableDBPurge}