From cacf1c533bce890ecfb8871e6a762e9640e34b3b Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Thu, 31 Aug 2023 13:01:30 +0200 Subject: [PATCH] Removing references to ansibleee Role struct Signed-off-by: Jiri Podivin --- pkg/ceilometercompute/ansibleee.go | 17 +---------------- pkg/infracompute/ansibleee.go | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/pkg/ceilometercompute/ansibleee.go b/pkg/ceilometercompute/ansibleee.go index e6f5fab1..16622a3a 100644 --- a/pkg/ceilometercompute/ansibleee.go +++ b/pkg/ceilometercompute/ansibleee.go @@ -38,22 +38,7 @@ func AnsibleEE( ansibleeeSpec := ansibleeev1.NewOpenStackAnsibleEE(ServiceName) - role := &ansibleeev1.Role{ - Strategy: "free", - Become: true, - Tasks: []ansibleeev1.Task{ - { - Name: "Deploy ceilometer", - ImportRole: ansibleeev1.ImportRole{ - Name: "osp.edpm.edpm_telemetry", - TasksFrom: instance.Spec.Playbook, - }, - Tags: []string{"edpm_telemetry"}, - }, - }, - } - - ansibleeeSpec.Role = role + ansibleeeSpec.Playbook = "osp.edpm.deploy_edpm_telemetry_ceilometer" ansibleeeSpec.Env = []corev1.EnvVar{ {Name: "ANSIBLE_FORCE_COLOR", Value: "True"}, diff --git a/pkg/infracompute/ansibleee.go b/pkg/infracompute/ansibleee.go index 61f3146a..ceece2d6 100644 --- a/pkg/infracompute/ansibleee.go +++ b/pkg/infracompute/ansibleee.go @@ -31,22 +31,7 @@ func AnsibleEE( ansibleeeSpec := ansibleeev1.NewOpenStackAnsibleEE(ServiceName) - role := &ansibleeev1.Role{ - Strategy: "free", - Become: true, - Tasks: []ansibleeev1.Task{ - { - Name: "Deploy ceilometer", - ImportRole: ansibleeev1.ImportRole{ - Name: "osp.edpm.edpm_telemetry", - TasksFrom: instance.Spec.Playbook, - }, - Tags: []string{"edpm_telemetry"}, - }, - }, - } - - ansibleeeSpec.Role = role + ansibleeeSpec.Playbook = "osp.edpm.deploy_edpm_telemetry_infra" ansibleeeSpec.Env = []corev1.EnvVar{ {Name: "ANSIBLE_FORCE_COLOR", Value: "True"},