From b4be9b148a3da41a9bfa9a626b129fc85de84a83 Mon Sep 17 00:00:00 2001 From: Erik Berg Date: Mon, 9 Aug 2021 10:57:57 +0200 Subject: [PATCH] Allow for a more permissible regex Some openstack installations use characters that are not in \w, the old regex, now moved to string2hash was more permissible, and there's probably no reason the regex in pythondict2hash can't be just as permissible. Change-Id: I35b964d96e6a558f1a10daa2391a398db60ea800 (cherry picked from commit 7111aa75f98b9038824d2a47e36dfd6d5043c80e) (cherry picked from commit 7ff77f8225f3974c04fdb6f3a9a6ddd2ff8a926a) (cherry picked from commit 99f8e1b4589be7e0930a44af8e374cadc01ccbc7) --- lib/puppet/provider/nova_aggregate/openstack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/nova_aggregate/openstack.rb b/lib/puppet/provider/nova_aggregate/openstack.rb index 23e8afa18..baa744e1b 100644 --- a/lib/puppet/provider/nova_aggregate/openstack.rb +++ b/lib/puppet/provider/nova_aggregate/openstack.rb @@ -123,7 +123,7 @@ Puppet::Type.type(:nova_aggregate).provide( end def self.pythondict2hash(input) - return JSON.parse(input.gsub(/u'(\w*)'/, '"\1"').gsub(/'/, '"')) + return JSON.parse(input.gsub(/u'([^']*)'/, '"\1"').gsub(/'/, '"')) end def self.parsestring(input)