Don't Unmarshal edpm_services_override

edpm_services_override is already marshal'd to JSON in
ansible_execution.go, so there's no need to unmarshal and print it to
string, b/c go drops the commas from the marshal'd value.

This was breaking the download-cache service that relies on the proper
value of edpm_services_override when using download-cache and
servicesOverride on a Deployment.

Jira: OSPRH-21737
Signed-off-by: James Slagle <jslagle@redhat.com>

Author: slagle

internal/dataplane/util/ansible_execution.go

@@ -278,7 +278,7 @@ func (a *EEJob) FormatAEEExtraVars(
 	}
 
 	if len(deployment.Spec.ServicesOverride) > 0 {
-		a.ExtraVars["edpm_services_override"] = json.RawMessage([]byte(fmt.Sprintf("\"%s\"", deployment.Spec.ServicesOverride)))
+		a.ExtraVars["edpm_services_override"], _ = json.Marshal(deployment.Spec.ServicesOverride)
 	}
 }
 

internal/dataplane/util/ansibleee.go

@@ -183,6 +183,10 @@ func (a *EEJob) JobForOpenStackAnsibleEE(h *helper.Helper) (*batchv1.Job, error)
 		parsedExtraVars := ""
 		// unmarshal nested data structures
 		for _, variable := range keys {
+			if variable == "edpm_services_override" {
+				parsedExtraVars += fmt.Sprintf("%s: %s\n", variable, a.ExtraVars[variable])
+				continue
+			}
 			var tmp interface{}
 			err := yaml.Unmarshal(a.ExtraVars[variable], &tmp)
 			if err != nil {

test/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml

@@ -204,7 +204,7 @@ spec:
 
             edpm_override_hosts: openstack-edpm-tls
             edpm_service_type: tls-dns-ips
-            edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns]
+            edpm_services_override: [install-certs-ovrd, tls-dns-ips, custom-tls-dns]
 
 
         imagePullPolicy: Always
@@ -315,7 +315,7 @@ spec:
 
             edpm_override_hosts: openstack-edpm-tls
             edpm_service_type: custom-tls-dns
-            edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns]
+            edpm_services_override: [install-certs-ovrd, tls-dns-ips, custom-tls-dns]
 
 
         imagePullPolicy: Always