summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-25 11:20:35 +0000
committerGerrit Code Review <review@openstack.org>2017-03-25 11:20:35 +0000
commitc851bf6a83cbf4f3357b7db7b4c039d881572052 (patch)
treee8080d622a1a7d430d1a0493e4db95a71120f46f /puppet/services
parenta7c923700a3ae288ef8b8936a4aba74c8e18fd32 (diff)
parent374945944ee4cb457c1bfd562a291c96bdfe685e (diff)
Merge "Add missing metadata_settings from neutron-api profile"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/neutron-api.yaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index bb102c08..7a24ffdd 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -57,6 +57,9 @@ parameters:
default:
tag: openstack.neutron.api
path: /var/log/neutron/server.log
+ EnableInternalTLS:
+ type: boolean
+ default: false
# DEPRECATED: the following options are deprecated and are currently maintained
# 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
appropriate for the deployment type. Alternate mechanisms will be
available to override.
- EnableInternalTLS:
- type: boolean
- default: false
-
parameter_groups:
- label: deprecated
description: |
@@ -204,3 +203,5 @@ outputs:
tags: step1
when: neutron_server_enabled.rc == 0
service: name=neutron-server state=stopped
+ metadata_settings:
+ get_attr: [TLSProxyBase, role_data, metadata_settings]