From 0bcd6e36e1771d8e3a871ff6ce7d4f48ac6af4d4 Mon Sep 17 00:00:00 2001 From: "Dennis J. Bell" Date: Mon, 15 Jul 2024 17:57:15 -0700 Subject: [PATCH] Fix regular expression for vsphere datastores The regular expression for vsphere datastores was not working as expected when there were multiple datastores. This was because the regular expression conflicted with using entombed credhub variables that are wrapped in parenthesis, causing three parenthesis in a row. --- overlay/cpis/vsphere.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/cpis/vsphere.yml b/overlay/cpis/vsphere.yml index fced56db..fb268466 100644 --- a/overlay/cpis/vsphere.yml +++ b/overlay/cpis/vsphere.yml @@ -11,9 +11,9 @@ meta: disk_path: (( concat genesis.env "/disks" )) joined_vsphere_ephemeral_datastores: (( join "|" params.vsphere_ephemeral_datastores )) - vsphere_ephemeral_datastores: (( concat "^(" meta.joined_vsphere_ephemeral_datastores ")$" )) + vsphere_ephemeral_datastores: (( concat "^(?:" meta.joined_vsphere_ephemeral_datastores ")$" )) joined_vsphere_persistent_datastores: (( join "|" params.vsphere_persistent_datastores )) - vsphere_persistent_datastores: (( concat "^(" meta.joined_vsphere_persistent_datastores ")$" )) + vsphere_persistent_datastores: (( concat "^(?:" meta.joined_vsphere_persistent_datastores ")$" )) bosh-variables: vcenter_dc: (( grab params.vsphere_datacenter ))