Enable metadata proxy secret for Contrail
Related-Bug: PROD-24565
Change-Id: I3b37cdca15fecbe01686f950577a662e05cc9bc6
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index d1ce170..33c1627 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -7134,9 +7134,7 @@
{%- if controller.network.get('protocol', 'http') == 'https' %}
cafile={{ controller.network.get('cacert_file', controller.cacert_file) }}
{%- endif %}
-{%- if controller.get('networking', 'default') != "contrail" %}
metadata_proxy_shared_secret={{ controller.metadata.password }}
-{%- endif %}
service_metadata_proxy=True
#
# This option specifies the URL for connecting to Neutron.
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index 80d7f85..d4a7c4d 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -7156,9 +7156,7 @@
{%- if controller.network.get('protocol', 'http') == 'https' %}
cafile={{ controller.network.get('cacert_file', controller.cacert_file) }}
{%- endif %}
-{%- if controller.get('networking', 'default') != "contrail" %}
metadata_proxy_shared_secret={{ controller.metadata.password }}
-{%- endif %}
service_metadata_proxy=True
#
# This option specifies the URL for connecting to Neutron.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 8a44e7b..3428e88 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -7725,9 +7725,7 @@
# * service_metadata_proxy
# (string value)
#metadata_proxy_shared_secret =
-{%- if controller.get('networking', 'default') != "contrail" %}
metadata_proxy_shared_secret = {{ controller.metadata.password }}
-{%- endif %}
# PEM encoded Certificate Authority to use when verifying HTTPs
# connections. (string value)