diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-19 03:13:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-19 03:13:49 +0000 |
| commit | 17e79c8b15d7746ce95f90a0b259481d6bd9302c (patch) | |
| tree | 09ca99fb9c19bd28752662dd74156eac2476c0a0 /puppet/services/neutron-metadata.yaml | |
| parent | 0b7c9a13ef977d50939a9a697c370d2ec26ed4b3 (diff) | |
| parent | 33bc901670a952b626d303c91466a593d1310167 (diff) | |
Merge "Enable TLS for nova-metadata"
Diffstat (limited to 'puppet/services/neutron-metadata.yaml')
| -rw-r--r-- | puppet/services/neutron-metadata.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index 81f12f01..30f34777 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -57,10 +57,15 @@ parameters: default: tag: openstack.neutron.agent.metadata path: /var/log/neutron/metadata-agent.log + EnableInternalTLS: + type: boolean + default: false conditions: neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']} + internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} + resources: NeutronBase: @@ -90,6 +95,17 @@ outputs: neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } neutron::agents::metadata::auth_tenant: 'service' neutron::agents::metadata::metadata_ip: "%{hiera('nova_metadata_vip')}" + neutron::agents::metadata::metadata_host: + str_replace: + template: + "%{hiera('cloud_name_$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, NovaMetadataNetwork]} + neutron::agents::metadata::metadata_protocol: + if: + - internal_tls_enabled + - 'https' + - 'http' - if: - neutron_workers_unset |