From 6d46f937e128db7d9465506eb9b4d537871726e0 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Fri, 27 Sep 2019 11:22:51 +0200 Subject: [PATCH] Ensure proper JSON serialization The current opportunistic way breaks if you're trying to pass bools. Change-Id: I4a79d9dcbc4234bd606a430cfe1c88c8650108e8 --- library/keystone_sp | 2 +- tasks/keystone_federation_sp_idp_setup.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/keystone_sp b/library/keystone_sp index 71417328..622511e6 100644 --- a/library/keystone_sp +++ b/library/keystone_sp @@ -82,7 +82,7 @@ class KeystoneSp(object): self.protocols_return_list = list() self.sp_data = self.module.params['sp_data'] if isinstance(self.sp_data, str): - self.sp_data = json.loads(self.sp_data.replace("'", '"')) + self.sp_data = json.loads(self.sp_data) def populate_sp_data(self): trusted_idp_list = self.sp_data['trusted_idp_list'] diff --git a/tasks/keystone_federation_sp_idp_setup.yml b/tasks/keystone_federation_sp_idp_setup.yml index c66d393f..4ed6f6dd 100644 --- a/tasks/keystone_federation_sp_idp_setup.yml +++ b/tasks/keystone_federation_sp_idp_setup.yml @@ -20,7 +20,7 @@ # User with_subelements instead, but in v1.x it's broken - name: Set keystone_federated_identities fact keystone_sp: - sp_data: "{{ keystone_sp }}" + sp_data: "{{ keystone_sp | to_json }}" - name: Ensure domain which remote IDP users are mapped onto exists keystone: