From b9a8b90be7cc940065734812869d5ca7c9ab77a3 Mon Sep 17 00:00:00 2001 From: jlarriba Date: Mon, 3 Jul 2023 17:58:57 +0200 Subject: [PATCH] Stop using playbooks and start using roles in ansibleee --- ...metry.openstack.org_ceilometercomputes.yaml | 2 +- .../telemetry.openstack.org_infracomputes.yaml | 2 +- .../telemetry.openstack.org_telemetries.yaml | 4 ++-- api/go.sum | 4 ---- api/v1beta1/ceilometercompute_types.go | 2 +- api/v1beta1/infracompute_types.go | 2 +- ...metry.openstack.org_ceilometercomputes.yaml | 2 +- .../telemetry.openstack.org_infracomputes.yaml | 2 +- .../telemetry.openstack.org_telemetries.yaml | 4 ++-- .../telemetry_v1beta1_ceilometercompute.yaml | 1 - .../telemetry_v1beta1_infracompute.yaml | 1 - .../samples/telemetry_v1beta1_telemetry.yaml | 2 -- go.mod | 2 +- go.sum | 4 ++-- pkg/ceilometercompute/ansibleee.go | 17 ++++++++++++++++- pkg/infracompute/ansibleee.go | 18 +++++++++++++++++- 16 files changed, 46 insertions(+), 23 deletions(-) diff --git a/api/bases/telemetry.openstack.org_ceilometercomputes.yaml b/api/bases/telemetry.openstack.org_ceilometercomputes.yaml index 97aac0d0..28296a0e 100644 --- a/api/bases/telemetry.openstack.org_ceilometercomputes.yaml +++ b/api/bases/telemetry.openstack.org_ceilometercomputes.yaml @@ -80,7 +80,7 @@ spec: type: string type: object playbook: - default: osp.edpm.deploy_edpm_telemetry_ceilometer.yml + default: deploy_ceilometer.yml description: Playbook executed type: string rabbitMqClusterName: diff --git a/api/bases/telemetry.openstack.org_infracomputes.yaml b/api/bases/telemetry.openstack.org_infracomputes.yaml index d896d26f..c0617231 100644 --- a/api/bases/telemetry.openstack.org_infracomputes.yaml +++ b/api/bases/telemetry.openstack.org_infracomputes.yaml @@ -53,7 +53,7 @@ spec: container type: string playbook: - default: osp.edpm.deploy_edpm_telemetry_infra.yml + default: deploy_infra.yml description: Playbook executed type: string serviceAccount: diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml index 5a56bf0f..74a8ad83 100644 --- a/api/bases/telemetry.openstack.org_telemetries.yaml +++ b/api/bases/telemetry.openstack.org_telemetries.yaml @@ -162,7 +162,7 @@ spec: type: string type: object playbook: - default: osp.edpm.deploy_edpm_telemetry_ceilometer.yml + default: deploy_ceilometer.yml description: Playbook executed type: string rabbitMqClusterName: @@ -220,7 +220,7 @@ spec: container type: string playbook: - default: osp.edpm.deploy_edpm_telemetry_infra.yml + default: deploy_infra.yml description: Playbook executed type: string serviceAccount: diff --git a/api/go.sum b/api/go.sum index 557c9fd6..cc20d9f8 100644 --- a/api/go.sum +++ b/api/go.sum @@ -204,7 +204,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -231,7 +230,6 @@ github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230627132558-cd98c8b86310 h1:LEtGGR0u6LGkcQVqms++XEfvUS8Vt5aJio+QKq0aaso= github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230627132558-cd98c8b86310/go.mod h1:cAXLyeKp6TiLW8qongnw6WR63Jnsm8CeRC5y07z3TAY= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -266,9 +264,7 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= diff --git a/api/v1beta1/ceilometercompute_types.go b/api/v1beta1/ceilometercompute_types.go index 5844edee..dc3a29b8 100644 --- a/api/v1beta1/ceilometercompute_types.go +++ b/api/v1beta1/ceilometercompute_types.go @@ -85,7 +85,7 @@ type CeilometerComputeSpec struct { DataplaneInventoryConfigMap string `json:"dataplaneInventoryConfigMap"` // Playbook executed - // +kubebuilder:default:="osp.edpm.deploy_edpm_telemetry_ceilometer.yml" + // +kubebuilder:default:="deploy_ceilometer.yml" Playbook string `json:"playbook,omitempty"` // ServiceAccount - service account name used internally to provide the default SA name diff --git a/api/v1beta1/infracompute_types.go b/api/v1beta1/infracompute_types.go index d71008e0..075530d0 100644 --- a/api/v1beta1/infracompute_types.go +++ b/api/v1beta1/infracompute_types.go @@ -50,7 +50,7 @@ type InfraComputeSpec struct { DataplaneInventoryConfigMap string `json:"dataplaneInventoryConfigMap"` // Playbook executed - // +kubebuilder:default:="osp.edpm.deploy_edpm_telemetry_infra.yml" + // +kubebuilder:default:="deploy_infra.yml" Playbook string `json:"playbook,omitempty"` // The extravars ConfigMap to pass to ansible execution diff --git a/config/crd/bases/telemetry.openstack.org_ceilometercomputes.yaml b/config/crd/bases/telemetry.openstack.org_ceilometercomputes.yaml index 97aac0d0..28296a0e 100644 --- a/config/crd/bases/telemetry.openstack.org_ceilometercomputes.yaml +++ b/config/crd/bases/telemetry.openstack.org_ceilometercomputes.yaml @@ -80,7 +80,7 @@ spec: type: string type: object playbook: - default: osp.edpm.deploy_edpm_telemetry_ceilometer.yml + default: deploy_ceilometer.yml description: Playbook executed type: string rabbitMqClusterName: diff --git a/config/crd/bases/telemetry.openstack.org_infracomputes.yaml b/config/crd/bases/telemetry.openstack.org_infracomputes.yaml index d896d26f..c0617231 100644 --- a/config/crd/bases/telemetry.openstack.org_infracomputes.yaml +++ b/config/crd/bases/telemetry.openstack.org_infracomputes.yaml @@ -53,7 +53,7 @@ spec: container type: string playbook: - default: osp.edpm.deploy_edpm_telemetry_infra.yml + default: deploy_infra.yml description: Playbook executed type: string serviceAccount: diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml index 5a56bf0f..74a8ad83 100644 --- a/config/crd/bases/telemetry.openstack.org_telemetries.yaml +++ b/config/crd/bases/telemetry.openstack.org_telemetries.yaml @@ -162,7 +162,7 @@ spec: type: string type: object playbook: - default: osp.edpm.deploy_edpm_telemetry_ceilometer.yml + default: deploy_ceilometer.yml description: Playbook executed type: string rabbitMqClusterName: @@ -220,7 +220,7 @@ spec: container type: string playbook: - default: osp.edpm.deploy_edpm_telemetry_infra.yml + default: deploy_infra.yml description: Playbook executed type: string serviceAccount: diff --git a/config/samples/telemetry_v1beta1_ceilometercompute.yaml b/config/samples/telemetry_v1beta1_ceilometercompute.yaml index c89676a8..f2af268d 100644 --- a/config/samples/telemetry_v1beta1_ceilometercompute.yaml +++ b/config/samples/telemetry_v1beta1_ceilometercompute.yaml @@ -9,4 +9,3 @@ spec: dataplaneInventoryConfigMap: dataplanerole-edpm-compute initImage: quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified computeImage: quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified - playbook: osp.edpm.deploy_edpm_telemetry_ceilometer.yml diff --git a/config/samples/telemetry_v1beta1_infracompute.yaml b/config/samples/telemetry_v1beta1_infracompute.yaml index 29ff5ad2..6173684d 100644 --- a/config/samples/telemetry_v1beta1_infracompute.yaml +++ b/config/samples/telemetry_v1beta1_infracompute.yaml @@ -8,4 +8,3 @@ spec: dataplaneSSHSecret: dataplane-ansible-ssh-private-key-secret dataplaneInventoryConfigMap: dataplanerole-edpm-compute nodeExporterImage: quay.io/prometheus/node-exporter:v1.5.0 - playbook: osp.edpm.deploy_edpm_telemetry_infra.yml diff --git a/config/samples/telemetry_v1beta1_telemetry.yaml b/config/samples/telemetry_v1beta1_telemetry.yaml index 75c775d0..b40f834c 100644 --- a/config/samples/telemetry_v1beta1_telemetry.yaml +++ b/config/samples/telemetry_v1beta1_telemetry.yaml @@ -13,13 +13,11 @@ spec: ceilometerCompute: initImage: quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified computeImage: quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified - playbook: deploy-ceilometer.yaml dataplaneSSHSecret: dataplane-ansible-ssh-private-key-secret dataplaneInventoryConfigMap: dataplanerole-edpm-compute serviceAccount: telemetry-operator-telemetry infraCompute: nodeExporterImage: quay.io/prometheus/node-exporter:v1.5.0 - playbook: deploy-infra.yaml serviceAccount: telemetry-operator-telemetry dataplaneSSHSecret: dataplane-ansible-ssh-private-key-secret dataplaneInventoryConfigMap: dataplanerole-edpm-compute diff --git a/go.mod b/go.mod index ff009337..5e2d0c7c 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230622141005-e9220a4b3dfe github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230627132558-cd98c8b86310 github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230627132558-cd98c8b86310 - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230620085730-fddf65f65f88 + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230703102858-87737b736377 github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-00010101000000-000000000000 k8s.io/api v0.26.3 k8s.io/apimachinery v0.26.3 diff --git a/go.sum b/go.sum index b7209f1f..41e46d61 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-202305221 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230522113906-6f4206cbf317/go.mod h1:doFbVg0WhS++gy17cbP9/BrCySjCpuqKx7TbvmKPChY= github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230627132558-cd98c8b86310 h1:ks7tXrCN87bQaVrNMroqM+pgr2joCnf7ow5aYdGAcnY= github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230627132558-cd98c8b86310/go.mod h1:7sbo6DydOwpl8Ex1atTbXIrWYvZ++eSOJ0Z6RphJJ44= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230620085730-fddf65f65f88 h1:l1s8NZfIRKeiMrTsDQAKw44EwWQ2waaWv+TpJz+93Bk= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230620085730-fddf65f65f88/go.mod h1:e4hw70sdvXG8anfBSGq5VMq11h52aN/TI3HYxjPyDGE= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230703102858-87737b736377 h1:3p9z0lGbZthsrvY7lwtdrlUm1LTUnFKwBJWFadjsEQE= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230703102858-87737b736377/go.mod h1:dpIdzGakxXSbkIC5f3iuqMVMtr7N2VLtKT2sqPK4fso= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/ceilometercompute/ansibleee.go b/pkg/ceilometercompute/ansibleee.go index bada3b86..324550e4 100644 --- a/pkg/ceilometercompute/ansibleee.go +++ b/pkg/ceilometercompute/ansibleee.go @@ -38,7 +38,22 @@ func AnsibleEE( ansibleeeSpec := ansibleeev1.NewOpenStackAnsibleEE(ServiceName) - ansibleeeSpec.Playbook = instance.Spec.Playbook + 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.Env = []corev1.EnvVar{ {Name: "ANSIBLE_FORCE_COLOR", Value: "True"}, diff --git a/pkg/infracompute/ansibleee.go b/pkg/infracompute/ansibleee.go index 83d35636..61f3146a 100644 --- a/pkg/infracompute/ansibleee.go +++ b/pkg/infracompute/ansibleee.go @@ -31,7 +31,23 @@ func AnsibleEE( ansibleeeSpec := ansibleeev1.NewOpenStackAnsibleEE(ServiceName) - ansibleeeSpec.Playbook = instance.Spec.Playbook + 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.Env = []corev1.EnvVar{ {Name: "ANSIBLE_FORCE_COLOR", Value: "True"}, {Name: "ANSIBLE_SSH_ARGS", Value: "-C -o ControlMaster=auto -o ControlPersist=80s"},