openstack-k8s-operators · openshift-merge-robot · Sep 28, 2023 · Sep 6, 2023 · Sep 11, 2023 · Sep 11, 2023
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1870,6 +1870,7 @@ spec:
                 - ovn
                 - libvirt
                 - nova
+                - telemetry
                 items:
                   type: string
                 type: array

diff --git a/api/v1beta1/openstackdataplanenodeset_types.go b/api/v1beta1/openstackdataplanenodeset_types.go
@@ -56,7 +56,7 @@ type OpenStackDataPlaneNodeSetSpec struct {
 	NetworkAttachments []string `json:"networkAttachments,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={configure-network,validate-network,download-cache,install-os,configure-os,run-os,ovn,libvirt,nova}
+	// +kubebuilder:default={configure-network,validate-network,download-cache,install-os,configure-os,run-os,ovn,libvirt,nova,telemetry}
 	// Services list
 	Services []string `json:"services"`
 }

diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1870,6 +1870,7 @@ spec:
                 - ovn
                 - libvirt
                 - nova
+                - telemetry
                 items:
                   type: string
                 type: array

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
@@ -18,6 +18,7 @@ spec:
     - ovn
     - libvirt
     - nova
+    - telemetry
   preProvisioned: true
   nodes:
       edpm-compute-0:

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml
@@ -19,6 +19,7 @@ spec:
     - ovn
     - libvirt
     - nova
+    - telemetry
   baremetalSetTemplate:
     bmhLabelSelector:
       app: openstack

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml
@@ -18,6 +18,7 @@ spec:
     - ovn
     - libvirt
     - nova
+    - telemetry
   baremetalSetTemplate:
     bmhLabelSelector:
       app: openstack

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml
@@ -23,6 +23,7 @@ spec:
     - ovn
     - libvirt
     - nova
+    - telemetry
   nodes:
     edpm-compute-0:
       hostName: edpm-compute-0

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
@@ -19,6 +19,7 @@ spec:
     - ovn
     - libvirt
     - nova
+    - telemetry
   nodes:
       edpm-compute-0:
         hostName: edpm-compute-0

diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry.yaml
@@ -0,0 +1,9 @@
+apiVersion: dataplane.openstack.org/v1beta1
+kind: OpenStackDataPlaneService
+metadata:
+  name: telemetry
+spec:
+  label: dataplane-deployment-telemetry
+  secrets:
+    - ceilometer-compute-config-data
+  playbook: osp.edpm.telemetry
diff --git a/docs/deploying.md b/docs/deploying.md
@@ -273,6 +273,7 @@ The output should be similar to:
     ovn                 6d6h
     libvirt             6d6h
     nova                6d6h
+    telemetry           6d6h
 
 Each service uses the
 [`playbook`](https://openstack-k8s-operators.github.io/openstack-ansibleee-operator/openstack_ansibleee/#playbook)

diff --git a/docs/interacting_with_ansible.md b/docs/interacting_with_ansible.md
@@ -28,6 +28,7 @@ Sample output when the default list of services:
  dataplane-deployment-libvirt-edpm-compute                                  True     AnsibleExecutionJob complete
  dataplane-deployment-nova-edpm-compute                                     True     AnsibleExecutionJob complete
  dataplane-deployment-run-os-edpm-compute                                   True     AnsibleExecutionJob complete
+ dataplane-deployment-telemetry-edpm-compute                                True     AnsibleExecutionJob complete
  dataplane-deployment-validate-network-edpm-compute                         True     AnsibleExecutionJob complete
 
 Querying for pods with the OpenStackAnsibleEE label
@@ -54,6 +55,7 @@ Sample output:
  dataplane-deployment-libvirt-edpm-compute             1/1           8s         2m35s
  dataplane-deployment-nova-edpm-compute                1/1           8s         2m35s
  dataplane-deployment-run-os-edpm-compute              1/1           8s         2m19s
+ dataplane-deployment-telemetry-edpm-compute           1/1           8s         2m35s
  dataplane-deployment-validate-network-edpm-compute    1/1           8s         2m43s
 
 Using the job name, the corresponding pod can be retrieved:

diff --git a/tests/functional/openstackdataplanenodeset_controller_test.go b/tests/functional/openstackdataplanenodeset_controller_test.go
@@ -118,7 +118,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 					"run-os",
 					"ovn",
 					"libvirt",
-					"nova"},
+					"nova",
+					"telemetry"},
 			}
 			Expect(dataplaneNodeSetInstance.Spec).Should(Equal(emptyNodeSpec))
 		})
-Original file line number
+Diff line change
@@ Expand Up / @@ -1870,6 +1870,7 @@ spec: @@
                     - ovn
                     - libvirt
                     - nova
+                    - telemetry
                     items:
                       type: string
                     type: array
@@ Expand Down @@