Merge "Rename nova_metadata_* variables"

This commit is contained in:
Zuul 2020-12-01 19:55:08 +00:00 committed by Gerrit Code Review
commit efb04bddb5
2 changed files with 8 additions and 5 deletions

View File

@ -423,12 +423,15 @@ neutron_dnsmasq_force_metadata: False
# neutron_metadata_workers: 16
neutron_metadata_backlog: 4096
# The port used by neutron to access the nova metadata service.
neutron_nova_metadata_port: "{{ nova_metadata_port | default(8775) }}"
# The protocol used by neutron to access the nova metadata service.
nova_metadata_protocol: http
neutron_nova_metadata_protocol: "{{ nova_metadata_protocol | default('http') }}"
# If the nova_metadata_protocol is using a self-signed cert, then
# this flag should be set to a boolean True.
nova_metadata_insecure: False
neutron_nova_metadata_insecure: "{{ nova_metadata_insecure | default(False) }}"
###
### VPNaaS Configuration

View File

@ -6,9 +6,9 @@ debug = {{ debug }}
# Nova metadata service IP and port
nova_metadata_host = {{ internal_lb_vip_address }}
nova_metadata_port = {{ nova_metadata_port }}
nova_metadata_protocol = {{ nova_metadata_protocol }}
nova_metadata_insecure = {{ nova_metadata_insecure }}
nova_metadata_port = {{ neutron_nova_metadata_port }}
nova_metadata_protocol = {{ neutron_nova_metadata_protocol }}
nova_metadata_insecure = {{ neutron_nova_metadata_insecure }}
# Metadata proxy shared secret
metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}