Add ability to set reauthentication_auth_method option
To allow heat to reauthenticate using trusts for long running tasks
this option is needed to be set to 'trusts'.
Change-Id: I48c36487aee5cde5fd3cf139766038fecd7e3f28
Related-Prod: https://mirantis.jira.com/browse/PROD-27017
diff --git a/README.rst b/README.rst
index f443584..32fa6eb 100644
--- a/README.rst
+++ b/README.rst
@@ -23,6 +23,7 @@
enabled: true
version: icehouse
region: RegionOne
+ reauthentication_auth_method: trusts
bind:
metadata:
address: 10.0.106.10
diff --git a/heat/files/ocata/heat.conf.Debian b/heat/files/ocata/heat.conf.Debian
index 3ad453c..1a84373 100644
--- a/heat/files/ocata/heat.conf.Debian
+++ b/heat/files/ocata/heat.conf.Debian
@@ -41,6 +41,9 @@
# value)
# Allowed values: '', trusts
#reauthentication_auth_method =
+{%- if server.reauthentication_auth_method is defined %}
+reauthentication_auth_method = {{ server.reauthentication_auth_method }}
+{%- endif %}
# Gap, in seconds, to determine whether the given token is about to expire.
# (integer value)
diff --git a/heat/files/pike/heat.conf.Debian b/heat/files/pike/heat.conf.Debian
index 4a192b1..abaf53f 100644
--- a/heat/files/pike/heat.conf.Debian
+++ b/heat/files/pike/heat.conf.Debian
@@ -48,6 +48,9 @@
# value)
# Allowed values: '', trusts
#reauthentication_auth_method =
+{%- if server.reauthentication_auth_method is defined %}
+reauthentication_auth_method = {{ server.reauthentication_auth_method }}
+{%- endif %}
# Gap, in seconds, to determine whether the given token is about to expire.
# (integer value)
diff --git a/heat/files/queens/heat.conf.Debian b/heat/files/queens/heat.conf.Debian
index f5b4b13..fe8dd55 100644
--- a/heat/files/queens/heat.conf.Debian
+++ b/heat/files/queens/heat.conf.Debian
@@ -43,6 +43,9 @@
# '' - <No description provided>
# trusts - <No description provided>
#reauthentication_auth_method =
+{%- if server.reauthentication_auth_method is defined %}
+reauthentication_auth_method = {{ server.reauthentication_auth_method }}
+{%- endif %}
# Subset of trustor roles to be delegated to heat. If left unset, all roles of
# a user will be delegated to heat when creating a stack. (list value)
diff --git a/tests/pillar/server_plugin_dirs.sls b/tests/pillar/server_plugin_dirs.sls
index d96fac7..6f83cdc 100644
--- a/tests/pillar/server_plugin_dirs.sls
+++ b/tests/pillar/server_plugin_dirs.sls
@@ -3,6 +3,7 @@
enabled: true
region: RegionOne
version: ocata
+ reauthentication_auth_method: trusts
stack_domain_admin:
name: heat_domain_admin
password: password
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 4b77314..bc37203 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -4,6 +4,7 @@
region: RegionOne
version: pike
auth_encryption_key: "KeyToEncrypt-hasToBeExact32Charz"
+ reauthentication_auth_method: trusts
stack_domain_admin:
name: heat_domain_admin
password: password