Removing references to ansibleee Role struct

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
openstack-k8s-operators · Aug 31, 2023 · cacf1c5 · cacf1c5
1 parent ac5d892
commit cacf1c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 32 deletions.
diff --git 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
@@ -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"},