From e127627dea5df143bfe1df62773ba65045e01d54 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 20 Sep 2019 14:52:34 +0100
Subject: [PATCH] Remove some deprecated config options
Heat's [DEFAULT] deferred_auth_method is deprecated, and we are setting
the default value of 'trusts'.
Glance's [DEFAULT] registry_host is deprecated, and we do not deploy a
registry.
Change-Id: I80024907c575982699ce323cd9a93bab94c988d3
---
ansible/roles/glance/templates/glance-api.conf.j2 | 2 --
ansible/roles/heat/templates/heat.conf.j2 | 2 --
2 files changed, 4 deletions(-)
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index fdd225dea1..f26cab7900 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -9,8 +9,6 @@ bind_host = {{ api_interface_address }}
bind_port = {{ glance_api_listen_port }}
workers = {{ openstack_service_workers }}
-registry_host = {{ glance_internal_fqdn }}
-
{% if glance_backend_ceph | bool %}
show_multiple_locations = True
{% endif %}
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index e9da76dce6..7176adaad6 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -12,8 +12,6 @@ stack_domain_admin = heat_domain_admin
stack_domain_admin_password = {{ heat_domain_admin_password }}
stack_user_domain_name = heat_user_domain
-deferred_auth_method = trusts
-
{% if service_name == 'heat-engine' %}
num_engine_workers = {{ openstack_service_workers }}
{% endif %}
--
GitLab