Merge pull request openstack-k8s-operators#854 from rebtoor/export-ed…

…pm-services expose services list to ansibleee containers
bshephar · Apr 29, 2024 · fb06083 · fb06083
2 parents 4c4619a + 8804850
commit fb06083
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/deployment/inventory.go b/pkg/deployment/inventory.go
@@ -127,6 +127,9 @@ func GenerateNodeSetInventory(ctx context.Context, helper *helper.Helper,
 		nodeSetGroup.Vars["nodeset_tags"] = instance.Spec.Tags
 	}
 
+	// add services list
+	nodeSetGroup.Vars["edpm_services"] = instance.Spec.Services
+
 	nodeSetGroup.Vars["ansible_ssh_private_key_file"] = fmt.Sprintf("/runner/env/ssh_key/ssh_key_%s", instance.Name)
 
 	for _, node := range instance.Spec.Nodes {

diff --git a/pkg/util/ansible_execution.go b/pkg/util/ansible_execution.go
@@ -128,6 +128,10 @@ func AnsibleExecution(
 			ansibleEE.Spec.ExtraVars["edpm_service_name"] = json.RawMessage([]byte(fmt.Sprintf("\"%s\"", service.Name)))
 		}
 
+		if len(deployment.Spec.ServicesOverride) > 0 {
+			ansibleEE.Spec.ExtraVars["edpm_services_override"] = json.RawMessage([]byte(fmt.Sprintf("\"%s\"", deployment.Spec.ServicesOverride)))
+		}
+
 		for sshKeyNodeName, sshKeySecret := range sshKeySecrets {
 			if service.Spec.DeployOnAllNodeSets {
 				sshKeyName = fmt.Sprintf("ssh-key-%s", sshKeyNodeName)