From 88048503faa984a001653a0e2b420333fee33eb5 Mon Sep 17 00:00:00 2001 From: Roberto Alfieri Date: Tue, 23 Apr 2024 17:58:09 +0200 Subject: [PATCH] expose services list to ansibleee containers `edpm_services` will be exposed as inventory variable `edpm_services_override` will be exposed as ansible extra var Signed-off-by: Roberto Alfieri --- pkg/deployment/inventory.go | 3 +++ pkg/util/ansible_execution.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pkg/deployment/inventory.go b/pkg/deployment/inventory.go index 13c258c24..7ddf7e948 100644 --- 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 index 5fe643339..6a8c44e9c 100644 --- a/pkg/util/ansible_execution.go +++ b/pkg/util/ansible_execution.go @@ -124,6 +124,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)