Merge pull request #1089 from jpodivin/restore-aee-env-defaults

Restoring lost defaults for ansible env vars

Author: openshift-merge-bot[bot]

pkg/dataplane/util/ansible_execution.go

@@ -64,9 +64,10 @@ func AnsibleExecution(
 	}
 
 	ansibleEE := EEJob{
-		Name:      executionName,
-		Namespace: deployment.GetNamespace(),
-		Labels:    labels,
+		Name:             executionName,
+		Namespace:        deployment.GetNamespace(),
+		Labels:           labels,
+		EnvConfigMapName: "openstack-aee-default-env",
 	}
 
 	ansibleEE.NetworkAttachments = aeeSpec.NetworkAttachments

pkg/dataplane/util/ansibleee.go

@@ -230,10 +230,14 @@ func labelsForOpenStackAnsibleEE(name string, labels map[string]string) map[stri
 }
 
 func (a *EEJob) addEnvFrom(job *batchv1.Job) {
+	// Add optional config map
+
+	optional := true
 	job.Spec.Template.Spec.Containers[0].EnvFrom = []corev1.EnvFromSource{
 		{
 			ConfigMapRef: &corev1.ConfigMapEnvSource{
 				LocalObjectReference: corev1.LocalObjectReference{Name: a.EnvConfigMapName},
+				Optional:             &(optional),
 			},
 		},
 	}