aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-25 15:13:37 +0000
committerGerrit Code Review <review@openstack.org>2016-10-25 15:13:37 +0000
commit40a1176a36532bf61ca5f09f13821c1472ac6636 (patch)
tree9cd4fc07daa463e3e517a53dda633e5e27902c71
parent6f60958152efd1dd99a9f3831f6f6bc002bc03b5 (diff)
parent8c8e296ecf7d6259cd29a5aaefb8d03ba5d8c05a (diff)
downloadkolla-40a1176a36532bf61ca5f09f13821c1472ac6636.tar.gz
kolla-40a1176a36532bf61ca5f09f13821c1472ac6636.zip
Merge "Fix fernet related components added to fact var properly."
-rw-r--r--ansible/roles/keystone/tasks/reconfigure.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/ansible/roles/keystone/tasks/reconfigure.yml b/ansible/roles/keystone/tasks/reconfigure.yml
index 7cfeded61..6ef22ad9f 100644
--- a/ansible/roles/keystone/tasks/reconfigure.yml
+++ b/ansible/roles/keystone/tasks/reconfigure.yml
@@ -4,11 +4,15 @@
keystone_items:
- { name: keystone, group: keystone }
-- name: Add fernet related components to variable if fernet is enabled
+- name: Create fernet related components for variable if fernet is enabled
set_fact:
keystone_fernet_items:
- { name: keystone_fernet, group: keystone }
- { name: keystone_ssh, group: keystone }
+ when: keystone_token_provider == 'fernet'
+
+- name: Merge fernet related components to variable if fernet is enabled
+ set_fact:
keystone_items: "{{ keystone_items + keystone_fernet_items }}"
when: keystone_token_provider == 'fernet'