From e43313af85dddb8f5f9af454b276a24837b3c10d Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 28 Oct 2020 16:26:30 +0200 Subject: [PATCH] Rename nova_metadata_* variables Rename nova_metadata_* variables to neutron_nova_metadata_* so less confusing names. At the same time these new variables will have their defaults set to nova_metadata_* Change-Id: I073da66f9e395bbb99b1c21701c808f252c3a6cb --- defaults/main.yml | 7 +++++-- templates/metadata_agent.ini.j2 | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4b4f3cab..a6dd3aa2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/templates/metadata_agent.ini.j2 b/templates/metadata_agent.ini.j2 index cf3617b0..b99f0121 100644 --- a/templates/metadata_agent.ini.j2 +++ b/templates/metadata_agent.ini.j2 @@ -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 }}