aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-06 06:42:04 +0000
committerGerrit Code Review <review@openstack.org>2018-07-06 06:42:04 +0000
commit53b2cdca2c545dc6749684091b03647e0fe06003 (patch)
tree13ae9276ab4ef6b45d465ab5a99da6d5559a238c
parent095ec410de9b4d66660c0bcc479bf3299ad16efc (diff)
parentc4b8bedd0172fc6993a4f3c3842fb8f58853d31f (diff)
downloadkolla-ansible-53b2cdca2c545dc6749684091b03647e0fe06003.tar.gz
kolla-ansible-53b2cdca2c545dc6749684091b03647e0fe06003.zip
Merge "Remove trusts_delegated_roles"
-rw-r--r--ansible/roles/heat/templates/heat.conf.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 09a85eb76..1b4b6cd14 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -14,7 +14,6 @@ stack_domain_admin_password = {{ heat_domain_admin_password }}
stack_user_domain_name = heat_user_domain
deferred_auth_method = trusts
-trusts_delegated_roles = heat_stack_owner
{% if service_name == 'heat-engine' %}
num_engine_workers = {{ openstack_service_workers }}