From db09d4c96e4154b2409e9787354db398384f8dd8 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Mon, 11 Dec 2017 09:37:32 -0800 Subject: [PATCH] Add defaults for keystone insecure variables The default for 'openrc_insecure' was not working as expected. Both of the inner variables were evaluated as booleans first and the expression would fail if either was undefined. Change-Id: I5f296bfe6cab43ad782ae063ed9ed25414e316fc --- defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index de1eb7e..66734b7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,8 +26,9 @@ openrc_os_auth_url: "http://127.0.0.1:5000" openrc_region_name: RegionOne ## Deliberately allow access to SSL endpoints with bad certificates -openrc_insecure: "{{ (keystone_service_adminuri_insecure | bool or keystone_service_internaluri_insecure | bool) | default(false) }}" - +openrc_insecure: >- + {{ (keystone_service_adminuri_insecure | default(false) | bool or + keystone_service_internaluri_insecure | default(false) | bool) }} ## Create openrc file openrc_file_dest: "{{ ansible_env.HOME }}/openrc" openrc_file_owner: "{{ ansible_user_id }}"