openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add missing metadata_settings from neutron-api profile"

This commit is contained in:
Jenkins 2017-03-25 11:20:35 +00:00 committed by Gerrit Code Review
parent a7c923700a 374945944e
commit c851bf6a83
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/services/neutron-api.yaml
View File

@ -57,6 +57,9 @@ parameters:
default: default:
tag: openstack.neutron.api tag: openstack.neutron.api
path: /var/log/neutron/server.log path: /var/log/neutron/server.log
EnableInternalTLS:
type: boolean
default: false
# DEPRECATED: the following options are deprecated and are currently maintained # DEPRECATED: the following options are deprecated and are currently maintained
# for backwards compatibility. They will be removed in the Ocata cycle. # for backwards compatibility. They will be removed in the Ocata cycle.
@ -71,10 +74,6 @@ parameters:
removed in Ocata. Future releases will enable L3 HA by default if it is removed in Ocata. Future releases will enable L3 HA by default if it is
appropriate for the deployment type. Alternate mechanisms will be appropriate for the deployment type. Alternate mechanisms will be
available to override. available to override.
EnableInternalTLS:
type: boolean
default: false
parameter_groups: parameter_groups:
- label: deprecated - label: deprecated
description: | description: |
@ -204,3 +203,5 @@ outputs:
tags: step1 tags: step1
when: neutron_server_enabled.rc == 0 when: neutron_server_enabled.rc == 0
service: name=neutron-server state=stopped service: name=neutron-server state=stopped
metadata_settings:
get_attr: [TLSProxyBase, role_data, metadata_settings]