Merge "Fix resetting user password in keystoneng" into release/2019.2.0
diff --git a/keystone/client/server.sls b/keystone/client/server.sls
index e470585..9f97b74 100644
--- a/keystone/client/server.sls
+++ b/keystone/client/server.sls
@@ -89,6 +89,17 @@
keystoneng.endpoint_absent:
- name: {{ service_name }}
- region: {{ endpoint.region }}
+ - require:
+ - keystoneng: keystone_{{ server_name }}_service_{{ service_name }}
+ {%- if server.admin.token is defined %}
+ - connection_token: {{ connection_args.token }}
+ - connection_endpoint: {{ connection_args.endpoint }}
+ {%- else %}
+ - connection_user: {{ connection_args.user }}
+ - connection_password: {{ connection_args.password }}
+ - connection_tenant: {{ connection_args.tenant }}
+ - connection_auth_url: {{ connection_args.auth_url }}
+ {%- endif %}
{%- endif %}