Add dataplane service dependency graph and fallback ordering

api/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -116,6 +116,13 @@ spec:
                 items:
                   type: string
                 type: array
+              useParallelExecution:
+                default: false
+                description: |-
+                  UseParallelExecution enables parallel execution of services based on
+                  their dependsOn dependencies. When not set (default), services run
+                  sequentially in list order and service dependencies are ignored.
+                type: boolean
             required:
             - deploymentRequeueTime
             - nodeSets

api/bases/dataplane.openstack.org_openstackdataplaneservices.yaml

@@ -116,6 +116,17 @@ spec:
                       x-kubernetes-map-type: atomic
                   type: object
                 type: array
+              dependsOn:
+                description: |-
+                  DependsOn lists EDPMServiceType or CR names that must complete before
+                  this service runs; if empty, the list predecessor is used instead.
+                  Entries referencing a service that is not part of the deployment's
+                  service list are ignored, so a service can be deployed on its own
+                  (e.g. via OpenStackDataPlaneDeployment spec.servicesOverride) without
+                  its prerequisites.
+                items:
+                  type: string
+                type: array
               deployOnAllNodeSets:
                 description: |-
                   DeployOnAllNodeSets - should the service be deploy across all nodesets

api/dataplane/v1beta1/openstackdataplanedeployment_types.go

@@ -76,6 +76,12 @@ type OpenStackDataPlaneDeploymentSpec struct {
 	// AnsibleJobNodeSelector to target subset of worker nodes running the ansible jobs
 	AnsibleJobNodeSelector map[string]string `json:"ansibleJobNodeSelector,omitempty"`
 
+	// UseParallelExecution enables parallel execution of services based on
+	// their dependsOn dependencies. When not set (default), services run
+	// sequentially in list order and service dependencies are ignored.
+	// +kubebuilder:default:=false
+	UseParallelExecution bool `json:"useParallelExecution,omitempty"`
+
 	// +kubebuilder:validation:MaxLength:=253
 	// +kubebuilder:default="openstack-aee-default-env"
 	// AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment

api/dataplane/v1beta1/openstackdataplaneservice_types.go

@@ -117,6 +117,15 @@ type OpenStackDataPlaneServiceSpec struct {
 	// to manage the service. If not set, will default to the
 	// OpenStackDataPlaneService name.
 	EDPMServiceType string `json:"edpmServiceType,omitempty" yaml:"edpmServiceType,omitempty"`
+
+	// DependsOn lists EDPMServiceType or CR names that must complete before
+	// this service runs; if empty, the list predecessor is used instead.
+	// Entries referencing a service that is not part of the deployment's
+	// service list are ignored, so a service can be deployed on its own
+	// (e.g. via OpenStackDataPlaneDeployment spec.servicesOverride) without
+	// its prerequisites.
+	// +kubebuilder:validation:Optional
+	DependsOn []string `json:"dependsOn,omitempty" yaml:"dependsOn,omitempty"`
 }
 
 // OpenStackDataPlaneServiceStatus defines the observed state of OpenStackDataPlaneService

bindata/crds/crds.yaml

@@ -20229,6 +20229,13 @@ spec:
                 items:
                   type: string
                 type: array
+              useParallelExecution:
+                default: false
+                description: |-
+                  UseParallelExecution enables parallel execution of services based on
+                  their dependsOn dependencies. When not set (default), services run
+                  sequentially in list order and service dependencies are ignored.
+                type: boolean
             required:
             - deploymentRequeueTime
             - nodeSets
@@ -22177,6 +22184,17 @@ spec:
                       x-kubernetes-map-type: atomic
                   type: object
                 type: array
+              dependsOn:
+                description: |-
+                  DependsOn lists EDPMServiceType or CR names that must complete before
+                  this service runs; if empty, the list predecessor is used instead.
+                  Entries referencing a service that is not part of the deployment's
+                  service list are ignored, so a service can be deployed on its own
+                  (e.g. via OpenStackDataPlaneDeployment spec.servicesOverride) without
+                  its prerequisites.
+                items:
+                  type: string
+                type: array
               deployOnAllNodeSets:
                 description: |-
                   DeployOnAllNodeSets - should the service be deploy across all nodesets

config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -116,6 +116,13 @@ spec:
                 items:
                   type: string
                 type: array
+              useParallelExecution:
+                default: false
+                description: |-
+                  UseParallelExecution enables parallel execution of services based on
+                  their dependsOn dependencies. When not set (default), services run
+                  sequentially in list order and service dependencies are ignored.
+                type: boolean
             required:
             - deploymentRequeueTime
             - nodeSets

config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml

@@ -116,6 +116,17 @@ spec:
                       x-kubernetes-map-type: atomic
                   type: object
                 type: array
+              dependsOn:
+                description: |-
+                  DependsOn lists EDPMServiceType or CR names that must complete before
+                  this service runs; if empty, the list predecessor is used instead.
+                  Entries referencing a service that is not part of the deployment's
+                  service list are ignored, so a service can be deployed on its own
+                  (e.g. via OpenStackDataPlaneDeployment spec.servicesOverride) without
+                  its prerequisites.
+                items:
+                  type: string
+                type: array
               deployOnAllNodeSets:
                 description: |-
                   DeployOnAllNodeSets - should the service be deploy across all nodesets

config/services/dataplane_v1beta1_openstackdataplaneservice_bootstrap.yaml

@@ -6,3 +6,6 @@ spec:
   playbook: osp.edpm.bootstrap
   edpmServiceType: bootstrap
   caCerts: combined-ca-bundle
+  dependsOn:
+    - redhat
+    - download-cache

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_network.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.configure_network
   edpmServiceType: configure-network
+  dependsOn:
+    - bootstrap

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_os.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.configure_os
   edpmServiceType: configure-os
+  dependsOn:
+    - install-os

config/services/dataplane_v1beta1_openstackdataplaneservice_download_cache.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.download_cache
   edpmServiceType: download-cache
+  dependsOn:
+    - redhat

config/services/dataplane_v1beta1_openstackdataplaneservice_frr.yaml

@@ -4,6 +4,9 @@ metadata:
   name: frr
 spec:
   playbook: osp.edpm.frr
+  dependsOn:
+    - run-os
+    - validate-network
   containerImageFields:
   - EdpmFrrImage
   edpmServiceType: frr

config/services/dataplane_v1beta1_openstackdataplaneservice_install_certs.yaml

@@ -6,3 +6,5 @@ spec:
   playbook: osp.edpm.install_certs
   addCertMounts: True
   edpmServiceType: install-certs
+  dependsOn:
+    - bootstrap

config/services/dataplane_v1beta1_openstackdataplaneservice_install_os.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.install_os
   edpmServiceType: install-os
+  dependsOn:
+    - bootstrap

config/services/dataplane_v1beta1_openstackdataplaneservice_libvirt.yaml

@@ -4,6 +4,10 @@ metadata:
   name: libvirt
 spec:
   playbook: osp.edpm.libvirt
+  dependsOn:
+    - run-os
+    - validate-network
+    - install-certs
   dataSources:
     # NOTE: this Secret needs to be created before deploying the data plane.
     # It should contain the libvirt sasl auth password using the key LibvirtPassword

config/services/dataplane_v1beta1_openstackdataplaneservice_logging.yaml

@@ -3,6 +3,9 @@ kind: OpenStackDataPlaneService
 metadata:
   name: logging
 spec:
+  dependsOn:
+    - run-os
+    - validate-network
   dataSources:
     - secretRef:
         name: logging-compute-config-data

config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_dhcp.yaml

@@ -4,6 +4,9 @@ metadata:
   name: neutron-dhcp
 spec:
   playbook: osp.edpm.neutron_dhcp
+  dependsOn:
+    - run-os
+    - validate-network
   dataSources:
     - secretRef:
         name: neutron-dhcp-agent-neutron-config

config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_metadata.yaml

@@ -4,6 +4,8 @@ metadata:
   name: neutron-metadata
 spec:
   playbook: osp.edpm.neutron_metadata
+  dependsOn:
+    - ovn
   dataSources:
     - secretRef:
         name: neutron-ovn-metadata-agent-neutron-config

config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml

@@ -4,6 +4,8 @@ metadata:
   name: neutron-ovn
 spec:
   playbook: osp.edpm.neutron_ovn
+  dependsOn:
+    - ovn
   dataSources:
     - secretRef:
         name: neutron-ovn-agent-neutron-config

config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_sriov.yaml

@@ -4,6 +4,9 @@ metadata:
   name: neutron-sriov
 spec:
   playbook: osp.edpm.neutron_sriov
+  dependsOn:
+    - run-os
+    - validate-network
   dataSources:
     - secretRef:
         name: neutron-sriov-agent-neutron-config

config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml

@@ -3,6 +3,13 @@ kind: OpenStackDataPlaneService
 metadata:
   name: nova
 spec:
+  dependsOn:
+    - libvirt
+    - ssh-known-hosts
+    - neutron-ovn
+    - neutron-sriov
+    - neutron-dhcp
+    - neutron-metadata
   dataSources:
     - secretRef:
         name: nova-cell1-compute-config

config/services/dataplane_v1beta1_openstackdataplaneservice_os_reboot.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.reboot
   edpmServiceType: reboot-os
+  dependsOn:
+    - run-os

config/services/dataplane_v1beta1_openstackdataplaneservice_ovn.yaml

@@ -4,6 +4,10 @@ metadata:
   name: ovn
 spec:
   playbook: osp.edpm.ovn
+  dependsOn:
+    - run-os
+    - validate-network
+    - install-certs
   dataSources:
     - configMapRef:
         name: ovncontroller-config

config/services/dataplane_v1beta1_openstackdataplaneservice_ovn_bgp_agent.yaml

@@ -4,6 +4,8 @@ metadata:
   name: ovn-bgp-agent
 spec:
   playbook: osp.edpm.ovn_bgp_agent
+  dependsOn:
+    - ovn
   dataSources:
     - secretRef:
         name: neutron-ovn-agent-neutron-config

config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml

@@ -7,3 +7,5 @@ spec:
   containerImageFields:
   - EdpmLogrotateCrondImage
   edpmServiceType: run-os
+  dependsOn:
+    - configure-os

config/services/dataplane_v1beta1_openstackdataplaneservice_ssh_known_hosts.yaml

@@ -6,3 +6,6 @@ spec:
   playbook: osp.edpm.ssh_known_hosts
   deployOnAllNodeSets: true
   edpmServiceType: ssh-known-hosts
+  dependsOn:
+    - install-os
+    - configure-network

config/services/dataplane_v1beta1_openstackdataplaneservice_swift.yaml

@@ -4,6 +4,9 @@ metadata:
   name: swift
 spec:
   playbook: osp.edpm.swift
+  dependsOn:
+    - run-os
+    - validate-network
   dataSources:
     - secretRef:
         name: swift-conf

config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry.yaml

@@ -3,6 +3,8 @@ kind: OpenStackDataPlaneService
 metadata:
   name: telemetry
 spec:
+  dependsOn:
+    - nova
   dataSources:
     - secretRef:
         name: ceilometer-compute-config-data

config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml

@@ -3,6 +3,8 @@ kind: OpenStackDataPlaneService
 metadata:
   name: telemetry-power-monitoring
 spec:
+  dependsOn:
+    - nova
   dataSources:
     - secretRef:
         name: ceilometer-ipmi-config-data

config/services/dataplane_v1beta1_openstackdataplaneservice_validate_network.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   playbook: osp.edpm.validate_network
   edpmServiceType: validate-network
+  dependsOn:
+    - configure-network