diff --git a/tests/functional/dataplane/openstackdataplanedeployment_controller_test.go b/tests/functional/dataplane/openstackdataplanedeployment_controller_test.go index bfec131e2..499c8ba97 100644 --- a/tests/functional/dataplane/openstackdataplanedeployment_controller_test.go +++ b/tests/functional/dataplane/openstackdataplanedeployment_controller_test.go @@ -1217,7 +1217,7 @@ var _ = Describe("Dataplane Deployment Test", func() { Namespace: dataplaneMultiNodesetDeploymentName.Namespace, } ansibleEE := GetAnsibleee(ansibleeeName) - ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded + ansibleEE.Status.Succeeded = 1 g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed()) }, th.Timeout, th.Interval).Should(Succeed()) } @@ -1424,7 +1424,7 @@ var _ = Describe("Dataplane Deployment Test", func() { Namespace: dataplaneMultiNodesetDeploymentName.Namespace, } ansibleEE := GetAnsibleee(ansibleeeName) - ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded + ansibleEE.Status.Succeeded = 1 g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed()) }, th.Timeout, th.Interval).Should(Succeed()) } @@ -1449,7 +1449,7 @@ var _ = Describe("Dataplane Deployment Test", func() { Namespace: dataplaneMultiNodesetDeploymentName.Namespace, } ansibleEE := GetAnsibleee(ansibleeeName) - ansibleEE.Status.JobStatus = ansibleeev1.JobStatusSucceeded + ansibleEE.Status.Succeeded = 1 g.Expect(th.K8sClient.Status().Update(th.Ctx, ansibleEE)).To(Succeed()) }, th.Timeout, th.Interval).Should(Succeed()) } diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml index 8c38bc513..7714ebbf3 100644 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml @@ -70,10 +70,18 @@ status: status: "True" type: SetupReady --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: custom-global-service-edpm-compute-global + openstackansibleee_cr: custom-global-service-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: custom-global-service + osaee: "true" name: custom-global-service-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -84,60 +92,107 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key/ssh_key_edpm-compute-global - name: ssh-key-edpm-compute-global - subPath: ssh_key_edpm-compute-global - - mountPath: /runner/inventory/inventory-0 - name: inventory-0 - subPath: inventory-0 - volumes: - - name: ssh-key-edpm-compute-global - secret: - items: - - key: ssh-privatekey - path: ssh_key_edpm-compute-global - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory-0 - secret: - items: - - key: inventory - path: inventory-0 - secretName: dataplanenodeset-edpm-compute-global - extraVars: - edpm_override_hosts: all - name: openstackansibleee - playbookContents: | - - hosts: localhost - gather_facts: no - name: global kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - preserveJobs: true - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: custom-global-service-edpm-compute-global + job-name: custom-global-service-edpm-compute-global + openstackansibleee_cr: custom-global-service-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: custom-global-service + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - custom-global-service-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: global kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: all + edpm_service_type: custom-global-service + + + imagePullPolicy: Always + name: custom-global-service-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key/ssh_key_edpm-compute-global + name: ssh-key-edpm-compute-global + subPath: ssh_key_edpm-compute-global + - mountPath: /runner/inventory/inventory-0 + name: inventory-0 + subPath: inventory-0 + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key-edpm-compute-global + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key_edpm-compute-global + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory-0 + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory-0 + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + succeeded: 1 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: download-cache-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: download-cache-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: download-cache + osaee: "true" name: download-cache-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -148,46 +203,103 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.download_cache - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: download-cache-edpm-compute-global-edpm-compute-global + job-name: download-cache-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: download-cache-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: download-cache + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.download_cache + - -i + - download-cache-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.download_cache + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: download-cache + + + imagePullPolicy: Always + name: download-cache-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: bootstrap-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: bootstrap-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: bootstrap + osaee: "true" name: bootstrap-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -198,47 +310,104 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.bootstrap - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: bootstrap-edpm-compute-global-edpm-compute-global + job-name: bootstrap-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: bootstrap-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: bootstrap + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.bootstrap + - -i + - bootstrap-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.bootstrap + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: bootstrap + + + imagePullPolicy: Always + name: bootstrap-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: configure-network-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: configure-network-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: configure-network + osaee: "true" name: configure-network-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -249,46 +418,104 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.configure_network - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: configure-network-edpm-compute-global-edpm-compute-global + job-name: configure-network-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: configure-network-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: configure-network + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.configure_network + - -i + - configure-network-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.configure_network + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: configure-network + + + imagePullPolicy: Always + name: configure-network-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: validate-network-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: validate-network-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: validate-network + osaee: "true" name: validate-network-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -299,97 +526,104 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.validate_network - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady ---- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE -metadata: - name: install-os-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.install_os - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: validate-network-edpm-compute-global-edpm-compute-global + job-name: validate-network-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: validate-network-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: validate-network + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.validate_network + - -i + - validate-network-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.validate_network + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: validate-network + + + imagePullPolicy: Always + name: validate-network-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: configure-os-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: configure-os-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: configure-os + osaee: "true" name: configure-os-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -400,96 +634,104 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.configure_os - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady ---- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE -metadata: - name: run-os-edpm-compute-global-edpm-compute-global - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-global -spec: - backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.run_os - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: configure-os-edpm-compute-global-edpm-compute-global + job-name: configure-os-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: configure-os-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: configure-os + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.configure_os + - -i + - configure-os-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.configure_os + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: configure-os + + + imagePullPolicy: Always + name: configure-os-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: install-certs-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: install-certs-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: install-certs + osaee: "true" name: install-certs-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -500,47 +742,95 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.install_certs - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: install-certs-edpm-compute-global-edpm-compute-global + job-name: install-certs-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: install-certs-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: install-certs + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.install_certs + - -i + - install-certs-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.install_certs + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: install-certs + + + imagePullPolicy: Always + name: install-certs-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: ovn-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: ovn-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: ovn + osaee: "true" name: ovn-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -551,58 +841,105 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - volumes: - - configMap: - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.ovn - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: ovn-edpm-compute-global-edpm-compute-global + job-name: ovn-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: ovn-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: ovn + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.ovn + - -i + - ovn-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.ovn + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: ovn + + + imagePullPolicy: Always + name: ovn-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config + name: ovncontroller-config-0 + subPath: ovsdb-config + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + defaultMode: 420 + items: + - key: ovsdb-config + path: ovsdb-config + name: ovncontroller-config + name: ovncontroller-config-0 + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-metadata-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-metadata-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-metadata + osaee: "true" name: neutron-metadata-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -613,87 +950,135 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf - name: neutron-ovn-metadata-agent-neutron-config-0 - subPath: 10-neutron-metadata.conf - volumes: - - secret: - items: - - key: 10-neutron-metadata.conf - path: 10-neutron-metadata.conf - secretName: neutron-ovn-metadata-agent-neutron-config - name: neutron-ovn-metadata-agent-neutron-config-0 - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf - name: nova-metadata-neutron-config-0 - subPath: 05-nova-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf - name: nova-metadata-neutron-config-1 - subPath: httpd.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json - name: nova-metadata-neutron-config-2 - subPath: nova-metadata-config.json - volumes: - - secret: - items: - - key: 05-nova-metadata.conf - path: 05-nova-metadata.conf - secretName: nova-metadata-neutron-config - name: nova-metadata-neutron-config-0 - - name: nova-metadata-neutron-config-1 - secret: - items: - - key: httpd.conf - path: httpd.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-2 - secret: - items: - - key: nova-metadata-config.json - path: nova-metadata-config.json - secretName: nova-metadata-neutron-config - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_metadata - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-global-edpm-compute-global + job-name: neutron-metadata-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-metadata-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-metadata + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_metadata + - -i + - neutron-metadata-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_metadata + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: neutron-metadata + + + imagePullPolicy: Always + name: neutron-metadata-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf + name: neutron-ovn-metadata-agent-neutron-config-0 + subPath: 10-neutron-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf + name: nova-metadata-neutron-config-0 + subPath: 05-nova-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf + name: nova-metadata-neutron-config-1 + subPath: httpd.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json + name: nova-metadata-neutron-config-2 + subPath: nova-metadata-config.json + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-ovn-metadata-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-metadata.conf + path: 10-neutron-metadata.conf + secretName: neutron-ovn-metadata-agent-neutron-config + - name: nova-metadata-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 05-nova-metadata.conf + path: 05-nova-metadata.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-1 + secret: + defaultMode: 420 + items: + - key: httpd.conf + path: httpd.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-2 + secret: + defaultMode: 420 + items: + - key: nova-metadata-config.json + path: nova-metadata-config.json + secretName: nova-metadata-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-ovn-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-ovn-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-ovn + osaee: "true" name: neutron-ovn-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -704,58 +1089,105 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf - name: neutron-ovn-agent-neutron-config-0 - subPath: 10-neutron-ovn.conf - volumes: - - secret: - items: - - key: 10-neutron-ovn.conf - path: 10-neutron-ovn.conf - secretName: neutron-ovn-agent-neutron-config - name: neutron-ovn-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_ovn - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-global-edpm-compute-global + job-name: neutron-ovn-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-ovn-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-ovn + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_ovn + - -i + - neutron-ovn-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_ovn + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: neutron-ovn + + + imagePullPolicy: Always + name: neutron-ovn-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf + name: neutron-ovn-agent-neutron-config-0 + subPath: 10-neutron-ovn.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-ovn-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-ovn.conf + path: 10-neutron-ovn.conf + secretName: neutron-ovn-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-sriov-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-sriov-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-sriov + osaee: "true" name: neutron-sriov-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -766,58 +1198,105 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf - name: neutron-sriov-agent-neutron-config-0 - subPath: 10-neutron-sriov.conf - volumes: - - secret: - items: - - key: 10-neutron-sriov.conf - path: 10-neutron-sriov.conf - secretName: neutron-sriov-agent-neutron-config - name: neutron-sriov-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_sriov - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-global-edpm-compute-global + job-name: neutron-sriov-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-sriov-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-sriov + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_sriov + - -i + - neutron-sriov-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_sriov + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: neutron-sriov + + + imagePullPolicy: Always + name: neutron-sriov-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf + name: neutron-sriov-agent-neutron-config-0 + subPath: 10-neutron-sriov.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-sriov-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-sriov.conf + path: 10-neutron-sriov.conf + secretName: neutron-sriov-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-dhcp-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-dhcp + osaee: "true" name: neutron-dhcp-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -828,57 +1307,105 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf - name: neutron-dhcp-agent-neutron-config-0 - subPath: 10-neutron-dhcp.conf - volumes: - - secret: - items: - - key: 10-neutron-dhcp.conf - path: 10-neutron-dhcp.conf - secretName: neutron-dhcp-agent-neutron-config - name: neutron-dhcp-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_dhcp - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global + job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: neutron-dhcp-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: neutron-dhcp + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_dhcp + - -i + - neutron-dhcp-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_dhcp + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: neutron-dhcp + + + imagePullPolicy: Always + name: neutron-dhcp-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf + name: neutron-dhcp-agent-neutron-config-0 + subPath: 10-neutron-dhcp.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-dhcp-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-dhcp.conf + path: 10-neutron-dhcp.conf + secretName: neutron-dhcp-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: libvirt-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: libvirt-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: libvirt + osaee: "true" name: libvirt-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests ownerReferences: @@ -889,138 +1416,228 @@ metadata: name: edpm-compute-global spec: backoffLimit: 6 - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword - name: libvirt-secret-0 - subPath: LibvirtPassword - volumes: - - name: libvirt-secret-0 - secret: - items: - - key: LibvirtPassword - path: LibvirtPassword - secretName: libvirt-secret - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - preserveJobs: true - restartPolicy: Never - playbook: osp.edpm.libvirt - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: libvirt-edpm-compute-global-edpm-compute-global + job-name: libvirt-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: libvirt-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: libvirt + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.libvirt + - -i + - libvirt-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.libvirt + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: libvirt + + + imagePullPolicy: Always + name: libvirt-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword + name: libvirt-secret-0 + subPath: LibvirtPassword + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: libvirt-secret-0 + secret: + defaultMode: 420 + items: + - key: LibvirtPassword + path: LibvirtPassword + secretName: libvirt-secret + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: nova-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: nova-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: nova + osaee: "true" name: nova-edpm-compute-global-edpm-compute-global namespace: openstack-kuttl-tests + ownerReferences: + - apiVersion: dataplane.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true + kind: OpenStackDataPlaneDeployment + name: edpm-compute-global spec: backoffLimit: 6 - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/nova/01-nova.conf - name: nova-cell1-compute-config-0 - subPath: 01-nova.conf - - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf - name: nova-cell1-compute-config-1 - subPath: nova-blank.conf - volumes: - - name: nova-cell1-compute-config-0 - secret: - items: - - key: 01-nova.conf - path: 01-nova.conf - secretName: nova-cell1-compute-config - - name: nova-cell1-compute-config-1 - secret: - items: - - key: nova-blank.conf - path: nova-blank.conf - secretName: nova-cell1-compute-config - - mounts: - - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey - name: nova-migration-ssh-key-0 - subPath: ssh-privatekey - - mountPath: /var/lib/openstack/configs/nova/ssh-publickey - name: nova-migration-ssh-key-1 - subPath: ssh-publickey - volumes: - - name: nova-migration-ssh-key-0 - secret: - items: - - key: ssh-privatekey - path: ssh-privatekey - secretName: nova-migration-ssh-key - - name: nova-migration-ssh-key-1 - secret: - items: - - key: ssh-publickey - path: ssh-publickey - secretName: nova-migration-ssh-key - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-global - name: openstackansibleee - preserveJobs: true - restartPolicy: Never - playbook: osp.edpm.nova - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: nova-edpm-compute-global-edpm-compute-global + job-name: nova-edpm-compute-global-edpm-compute-global + openstackansibleee_cr: nova-edpm-compute-global-edpm-compute-global + openstackdataplanedeployment: edpm-compute-global + openstackdataplanenodeset: edpm-compute-global + openstackdataplaneservice: nova + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.nova + - -i + - nova-edpm-compute-global-edpm-compute-global + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.nova + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-global + edpm_service_type: nova + + + imagePullPolicy: Always + name: nova-edpm-compute-global-edpm-compute-global + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/nova/01-nova.conf + name: nova-cell1-compute-config-0 + subPath: 01-nova.conf + - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf + name: nova-cell1-compute-config-1 + subPath: nova-blank.conf + - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey + name: nova-migration-ssh-key-0 + subPath: ssh-privatekey + - mountPath: /var/lib/openstack/configs/nova/ssh-publickey + name: nova-migration-ssh-key-1 + subPath: ssh-publickey + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-global + serviceAccountName: edpm-compute-global + terminationGracePeriodSeconds: 30 + volumes: + - name: nova-cell1-compute-config-0 + secret: + defaultMode: 420 + items: + - key: 01-nova.conf + path: 01-nova.conf + secretName: nova-cell1-compute-config + - name: nova-cell1-compute-config-1 + secret: + defaultMode: 420 + items: + - key: nova-blank.conf + path: nova-blank.conf + secretName: nova-cell1-compute-config + - name: nova-migration-ssh-key-0 + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh-privatekey + secretName: nova-migration-ssh-key + - name: nova-migration-ssh-key-1 + secret: + defaultMode: 420 + items: + - key: ssh-publickey + path: ssh-publickey + secretName: nova-migration-ssh-key + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-global diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml index 085adb780..90a7a8440 100644 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml @@ -73,9 +73,17 @@ spec: - edpm-compute-global - edpm-compute-beta-nodeset --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: download-cache + osaee: "true" name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset namespace: openstack-kuttl-tests ownerReferences: @@ -86,46 +94,102 @@ metadata: name: edpm-multinodeset spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.download_cache - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: download-cache + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.download_cache + - -i + - download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.download_cache + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-beta-nodeset + edpm_service_type: download-cache + + + imagePullPolicy: Always + name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-beta-nodeset + serviceAccountName: edpm-compute-beta-nodeset + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-beta-nodeset status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: bootstrap + osaee: "true" name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset namespace: openstack-kuttl-tests ownerReferences: @@ -136,39 +200,87 @@ metadata: name: edpm-multinodeset spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.bootstrap - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: bootstrap + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.bootstrap + - -i + - bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.bootstrap + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-beta-nodeset + edpm_service_type: bootstrap + + + imagePullPolicy: Always + name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-beta-nodeset + serviceAccountName: edpm-compute-beta-nodeset + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-beta-nodeset status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml index 124bf2d5a..9c09dade7 100644 --- a/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml @@ -103,9 +103,18 @@ metadata: name: openstack-edpm-tls type: Opaque --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: install-certs-ovr + osaee: "true" name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: @@ -116,105 +125,218 @@ metadata: name: openstack-edpm-tls spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/certs/generic-service1/default - name: openstack-edpm-tls-generic-service1-default-certs-0 - volumes: - - name: openstack-edpm-tls-generic-service1-default-certs-0 - projected: - sources: - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-0 - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-1 - - secret: - name: openstack-edpm-tls-generic-service1-default-certs-2 - - mounts: - - mountPath: /var/lib/openstack/cacerts/generic-service1 - name: generic-service1-combined-ca-bundle - volumes: - - name: generic-service1-combined-ca-bundle - secret: - secretName: combined-ca-bundle - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + labels: + app: openstackansibleee + job-name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: install-certs-ovr + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: install-certs-ovr + + + imagePullPolicy: Always + name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/certs/generic-service1/default + name: openstack-edpm-tls-generic-service1-default-certs-0 + - mountPath: /var/lib/openstack/cacerts/generic-service1 + name: generic-service1-combined-ca-bundle + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: openstack-edpm-tls-generic-service1-default-certs-0 + projected: + defaultMode: 420 + sources: + - secret: + name: openstack-edpm-tls-generic-service1-default-certs-0 + - secret: + name: openstack-edpm-tls-generic-service1-default-certs-1 + - secret: + name: openstack-edpm-tls-generic-service1-default-certs-2 + - name: generic-service1-combined-ca-bundle + secret: + defaultMode: 420 + secretName: combined-ca-bundle + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + succeeded: 1 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: generic-service1-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: generic-service1-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: generic-service1 + osaee: "true" name: generic-service1-openstack-edpm-tls-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true kind: OpenStackDataPlaneDeployment name: openstack-edpm-tls spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + labels: + app: openstackansibleee + job-name: generic-service1-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: generic-service1-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: generic-service1 + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - generic-service1-openstack-edpm-tls-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: generic-service1 + + + imagePullPolicy: Always + name: generic-service1-openstack-edpm-tls-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + succeeded: 1 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml index 1c79d6d8e..7633f7f79 100644 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml @@ -66,9 +66,18 @@ status: status: "True" type: SetupReady --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: download-cache + osaee: "true" name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -79,46 +88,104 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.download_cache - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: download-cache + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.download_cache + - -i + - download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.download_cache + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: download-cache + foo: bar + + + imagePullPolicy: Always + name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: bootstrap + osaee: "true" name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -129,49 +196,105 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraVars: - foo: bar - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.bootstrap - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: bootstrap + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.bootstrap + - -i + - bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.bootstrap + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: bootstrap + foo: bar + + + imagePullPolicy: Always + name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-network + osaee: "true" name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -182,46 +305,105 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.configure_network - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-network + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.configure_network + - -i + - configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.configure_network + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: configure-network + foo: bar + + + imagePullPolicy: Always + name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: validate-network + osaee: "true" name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -232,97 +414,105 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.validate_network - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady ---- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE -metadata: - name: install-os-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.install_os - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: validate-network + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.validate_network + - -i + - validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.validate_network + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: validate-network + foo: bar + + + imagePullPolicy: Always + name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-os + osaee: "true" name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -333,96 +523,105 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.configure_os - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady ---- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE -metadata: - name: run-os-edpm-compute-no-nodes-edpm-compute-no-nodes - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes -spec: - backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.run_os - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-os + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.configure_os + - -i + - configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.configure_os + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: configure-os + foo: bar + + + imagePullPolicy: Always + name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} + --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: install-certs + osaee: "true" name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -433,47 +632,96 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.install_certs - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: install-certs + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.install_certs + - -i + - install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.install_certs + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: install-certs + foo: bar + + + imagePullPolicy: Always + name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: ovn + osaee: "true" name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -484,58 +732,106 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - volumes: - - configMap: - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.ovn - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: ovn + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.ovn + - -i + - ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.ovn + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: ovn + foo: bar + + + imagePullPolicy: Always + name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config + name: ovncontroller-config-0 + subPath: ovsdb-config + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + defaultMode: 420 + items: + - key: ovsdb-config + path: ovsdb-config + name: ovncontroller-config + name: ovncontroller-config-0 + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-metadata + osaee: "true" name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -546,87 +842,136 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf - name: neutron-ovn-metadata-agent-neutron-config-0 - subPath: 10-neutron-metadata.conf - volumes: - - secret: - items: - - key: 10-neutron-metadata.conf - path: 10-neutron-metadata.conf - secretName: neutron-ovn-metadata-agent-neutron-config - name: neutron-ovn-metadata-agent-neutron-config-0 - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf - name: nova-metadata-neutron-config-0 - subPath: 05-nova-metadata.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf - name: nova-metadata-neutron-config-1 - subPath: httpd.conf - - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json - name: nova-metadata-neutron-config-2 - subPath: nova-metadata-config.json - volumes: - - secret: - items: - - key: 05-nova-metadata.conf - path: 05-nova-metadata.conf - secretName: nova-metadata-neutron-config - name: nova-metadata-neutron-config-0 - - name: nova-metadata-neutron-config-1 - secret: - items: - - key: httpd.conf - path: httpd.conf - secretName: nova-metadata-neutron-config - - name: nova-metadata-neutron-config-2 - secret: - items: - - key: nova-metadata-config.json - path: nova-metadata-config.json - secretName: nova-metadata-neutron-config - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_metadata - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-metadata + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_metadata + - -i + - neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_metadata + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: neutron-metadata + foo: bar + + + imagePullPolicy: Always + name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-metadata/10-neutron-metadata.conf + name: neutron-ovn-metadata-agent-neutron-config-0 + subPath: 10-neutron-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/05-nova-metadata.conf + name: nova-metadata-neutron-config-0 + subPath: 05-nova-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/httpd.conf + name: nova-metadata-neutron-config-1 + subPath: httpd.conf + - mountPath: /var/lib/openstack/configs/neutron-metadata/nova-metadata-config.json + name: nova-metadata-neutron-config-2 + subPath: nova-metadata-config.json + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-ovn-metadata-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-metadata.conf + path: 10-neutron-metadata.conf + secretName: neutron-ovn-metadata-agent-neutron-config + - name: nova-metadata-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 05-nova-metadata.conf + path: 05-nova-metadata.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-1 + secret: + defaultMode: 420 + items: + - key: httpd.conf + path: httpd.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-2 + secret: + defaultMode: 420 + items: + - key: nova-metadata-config.json + path: nova-metadata-config.json + secretName: nova-metadata-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-ovn + osaee: "true" name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -637,58 +982,106 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf - name: neutron-ovn-agent-neutron-config-0 - subPath: 10-neutron-ovn.conf - volumes: - - secret: - items: - - key: 10-neutron-ovn.conf - path: 10-neutron-ovn.conf - secretName: neutron-ovn-agent-neutron-config - name: neutron-ovn-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_ovn - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-ovn + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_ovn + - -i + - neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_ovn + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: neutron-ovn + foo: bar + + + imagePullPolicy: Always + name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf + name: neutron-ovn-agent-neutron-config-0 + subPath: 10-neutron-ovn.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-ovn-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-ovn.conf + path: 10-neutron-ovn.conf + secretName: neutron-ovn-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-sriov + osaee: "true" name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -699,58 +1092,106 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf - name: neutron-sriov-agent-neutron-config-0 - subPath: 10-neutron-sriov.conf - volumes: - - secret: - items: - - key: 10-neutron-sriov.conf - path: 10-neutron-sriov.conf - secretName: neutron-sriov-agent-neutron-config - name: neutron-sriov-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_sriov - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-sriov + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_sriov + - -i + - neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_sriov + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: neutron-sriov + foo: bar + + + imagePullPolicy: Always + name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-sriov/10-neutron-sriov.conf + name: neutron-sriov-agent-neutron-config-0 + subPath: 10-neutron-sriov.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-sriov-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-sriov.conf + path: 10-neutron-sriov.conf + secretName: neutron-sriov-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 + labels: + app: openstackansibleee + job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-dhcp + osaee: "true" name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -761,57 +1202,106 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf - name: neutron-dhcp-agent-neutron-config-0 - subPath: 10-neutron-dhcp.conf - volumes: - - secret: - items: - - key: 10-neutron-dhcp.conf - path: 10-neutron-dhcp.conf - secretName: neutron-dhcp-agent-neutron-config - name: neutron-dhcp-agent-neutron-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.neutron_dhcp - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: neutron-dhcp + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.neutron_dhcp + - -i + - neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.neutron_dhcp + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: neutron-dhcp + foo: bar + + + imagePullPolicy: Always + name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/neutron-dhcp/10-neutron-dhcp.conf + name: neutron-dhcp-agent-neutron-config-0 + subPath: 10-neutron-dhcp.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: neutron-dhcp-agent-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 10-neutron-dhcp.conf + path: 10-neutron-dhcp.conf + secretName: neutron-dhcp-agent-neutron-config + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: libvirt + osaee: "true" name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -822,138 +1312,230 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword - name: libvirt-secret-0 - subPath: LibvirtPassword - volumes: - - name: libvirt-secret-0 - secret: - items: - - key: LibvirtPassword - path: LibvirtPassword - secretName: libvirt-secret - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - preserveJobs: true - restartPolicy: Never - playbook: osp.edpm.libvirt - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: libvirt + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.libvirt + - -i + - libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.libvirt + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: libvirt + foo: bar + + + imagePullPolicy: Always + name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword + name: libvirt-secret-0 + subPath: LibvirtPassword + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: libvirt-secret-0 + secret: + defaultMode: 420 + items: + - key: LibvirtPassword + path: LibvirtPassword + secretName: libvirt-secret + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: nova + osaee: "true" name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests + ownerReferences: + - apiVersion: dataplane.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true + kind: OpenStackDataPlaneDeployment + name: edpm-compute-no-nodes spec: backoffLimit: 6 - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/nova/01-nova.conf - name: nova-cell1-compute-config-0 - subPath: 01-nova.conf - - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf - name: nova-cell1-compute-config-1 - subPath: nova-blank.conf - volumes: - - name: nova-cell1-compute-config-0 - secret: - items: - - key: 01-nova.conf - path: 01-nova.conf - secretName: nova-cell1-compute-config - - name: nova-cell1-compute-config-1 - secret: - items: - - key: nova-blank.conf - path: nova-blank.conf - secretName: nova-cell1-compute-config - - mounts: - - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey - name: nova-migration-ssh-key-0 - subPath: ssh-privatekey - - mountPath: /var/lib/openstack/configs/nova/ssh-publickey - name: nova-migration-ssh-key-1 - subPath: ssh-publickey - volumes: - - name: nova-migration-ssh-key-0 - secret: - items: - - key: ssh-privatekey - path: ssh-privatekey - secretName: nova-migration-ssh-key - - name: nova-migration-ssh-key-1 - secret: - items: - - key: ssh-publickey - path: ssh-publickey - secretName: nova-migration-ssh-key - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - preserveJobs: true - restartPolicy: Never - playbook: osp.edpm.nova - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: nova + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.nova + - -i + - nova-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.nova + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: nova + foo: bar + + + imagePullPolicy: Always + name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/nova/01-nova.conf + name: nova-cell1-compute-config-0 + subPath: 01-nova.conf + - mountPath: /var/lib/openstack/configs/nova/nova-blank.conf + name: nova-cell1-compute-config-1 + subPath: nova-blank.conf + - mountPath: /var/lib/openstack/configs/nova/ssh-privatekey + name: nova-migration-ssh-key-0 + subPath: ssh-privatekey + - mountPath: /var/lib/openstack/configs/nova/ssh-publickey + name: nova-migration-ssh-key-1 + subPath: ssh-publickey + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: nova-cell1-compute-config-0 + secret: + defaultMode: 420 + items: + - key: 01-nova.conf + path: 01-nova.conf + secretName: nova-cell1-compute-config + - name: nova-cell1-compute-config-1 + secret: + defaultMode: 420 + items: + - key: nova-blank.conf + path: nova-blank.conf + secretName: nova-cell1-compute-config + - name: nova-migration-ssh-key-0 + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh-privatekey + secretName: nova-migration-ssh-key + - name: nova-migration-ssh-key-1 + secret: + defaultMode: 420 + items: + - key: ssh-publickey + path: ssh-publickey + secretName: nova-migration-ssh-key + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml index dee63901d..005edd66a 100644 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml @@ -6,65 +6,113 @@ collectors: command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack name: operator-logs --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: generation: 1 - name: custom-svc-edpm-compute-no-nodes-ovrd-edpm-compute-no-nodes + labels: + app: openstackansibleee + job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-os + osaee: "true" + name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 blockOwnerDeletion: true controller: true kind: OpenStackDataPlaneDeployment - name: edpm-compute-no-nodes-ovrd + name: edpm-compute-no-nodes spec: backoffLimit: 6 - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep 1 - delegate_to: localhost - preserveJobs: true - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: configure-os + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.configure_os + - -i + - configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.configure_os + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: configure-os + foo: bar + + + imagePullPolicy: Always + name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml index 14f8ce1eb..7bced2e02 100644 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml @@ -66,10 +66,17 @@ status: status: "True" type: SetupReady --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: - generation: 1 + labels: + app: openstackansibleee + job-name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + openstackansibleee_cr: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes-updated-ovn-cm + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: ovn + osaee: "true" name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -80,50 +87,100 @@ metadata: name: edpm-compute-no-nodes-updated-ovn-cm spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config - name: ovncontroller-config-0 - subPath: ovsdb-config - volumes: - - configMap: - items: - - key: ovsdb-config - path: ovsdb-config - name: ovncontroller-config - name: ovncontroller-config-0 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.ovn - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + openstackansibleee_cr: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes-updated-ovn-cm + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: ovn + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.ovn + - -i + - ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.ovn + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: ovn + edpm_services_override: [ovn] + + + imagePullPolicy: Always + name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/ovn/ovsdb-config + name: ovncontroller-config-0 + subPath: ovsdb-config + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + defaultMode: 420 + items: + - key: ovsdb-config + path: ovsdb-config + name: ovncontroller-config + name: ovncontroller-config-0 + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml index 26f623ba2..e4d5b21c3 100644 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml @@ -71,10 +71,18 @@ spec: - edpm-compute-no-nodes - edpm-compute-beta-nodeset --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: - name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + labels: + app: openstackansibleee + job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: bootstrap + osaee: "true" + name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 @@ -84,47 +92,103 @@ metadata: name: edpm-multinodeset spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.download_cache - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: bootstrap + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.bootstrap + - -i + - bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.bootstrap + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-beta-nodeset + edpm_service_type: bootstrap + foo: bar + + + imagePullPolicy: Always + name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-beta-nodeset + serviceAccountName: edpm-compute-beta-nodeset + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-beta-nodeset status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: - name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset + labels: + app: openstackansibleee + job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: download-cache + osaee: "true" + name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 @@ -134,39 +198,90 @@ metadata: name: edpm-multinodeset spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-beta-nodeset - name: openstackansibleee - restartPolicy: Never - playbook: osp.edpm.bootstrap - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackansibleee_cr: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + openstackdataplanedeployment: edpm-multinodeset + openstackdataplanenodeset: edpm-compute-beta-nodeset + openstackdataplaneservice: download-cache + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - osp.edpm.download_cache + - -i + - download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + osp.edpm.download_cache + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-beta-nodeset + edpm_service_type: download-cache + foo: bar + + + imagePullPolicy: Always + name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-beta-nodeset + serviceAccountName: edpm-compute-beta-nodeset + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-beta-nodeset status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml index 3b154fc9f..9c0553db8 100644 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml @@ -133,9 +133,17 @@ metadata: name: openstack-edpm-tls type: Opaque --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: install-certs-ovrd + osaee: "true" name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: @@ -146,110 +154,233 @@ metadata: name: openstack-edpm-tls spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/certs/tls-dnsnames/default - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - volumes: - - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - projected: - sources: - - secret: - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 - - mounts: - - mountPath: /var/lib/openstack/certs/tls-dnsnames/second - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - volumes: - - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - projected: - sources: - - secret: - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 - - mounts: - - mountPath: /var/lib/openstack/cacerts/tls-dnsnames - name: tls-dnsnames-combined-ca-bundle - volumes: - - name: tls-dnsnames-combined-ca-bundle - secret: - secretName: combined-ca-bundle - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: install-certs-ovrd + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: install-certs-ovrd + + + imagePullPolicy: Always + name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/certs/tls-dnsnames/default + name: openstack-edpm-tls-tls-dnsnames-default-certs-0 + - mountPath: /var/lib/openstack/certs/tls-dnsnames/second + name: openstack-edpm-tls-tls-dnsnames-second-certs-0 + - mountPath: /var/lib/openstack/cacerts/tls-dnsnames + name: tls-dnsnames-combined-ca-bundle + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: openstack-edpm-tls-tls-dnsnames-default-certs-0 + projected: + defaultMode: 420 + sources: + - secret: + name: openstack-edpm-tls-tls-dnsnames-default-certs-0 + - name: openstack-edpm-tls-tls-dnsnames-second-certs-0 + projected: + defaultMode: 420 + sources: + - secret: + name: openstack-edpm-tls-tls-dnsnames-second-certs-0 + - name: tls-dnsnames-combined-ca-bundle + secret: + defaultMode: 420 + secretName: combined-ca-bundle + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: tls-dnsnames + osaee: "true" name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true kind: OpenStackDataPlaneDeployment name: openstack-edpm-tls spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + openstackansibleee_cr: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: tls-dnsnames + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: tls-dnsnames + + + imagePullPolicy: Always + name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml b/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml index 1bff8a38b..386bc8a83 100644 --- a/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml @@ -139,10 +139,18 @@ metadata: name: openstack-edpm-tls type: Opaque --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: - name: install-certs-ovrd-openstack-edpm-tls-ovrd-openstack-edpm-tls + labels: + app: openstackansibleee + job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackansibleee_cr: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls-ovrd + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: tls-dns-ips + osaee: "true" + name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 @@ -152,164 +160,211 @@ metadata: name: openstack-edpm-tls-ovrd spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/certs/tls-dns-ips/default - name: openstack-edpm-tls-tls-dns-ips-default-certs-0 - volumes: - - name: openstack-edpm-tls-tls-dns-ips-default-certs-0 - projected: - sources: - - secret: - name: openstack-edpm-tls-tls-dns-ips-default-certs-0 - - mounts: - - mountPath: /var/lib/openstack/cacerts/tls-dns-ips - name: tls-dns-ips-combined-ca-bundle - volumes: - - name: tls-dns-ips-combined-ca-bundle - secret: - secretName: combined-ca-bundle - - mounts: - - mountPath: /var/lib/openstack/certs/custom-tls-dns/default - name: openstack-edpm-tls-custom-tls-dns-default-certs-0 - volumes: - - name: openstack-edpm-tls-custom-tls-dns-default-certs-0 - projected: - sources: - - secret: - name: openstack-edpm-tls-custom-tls-dns-default-certs-0 - - mounts: - - mountPath: /var/lib/openstack/cacerts/custom-tls-dns - name: custom-tls-dns-combined-ca-bundle - volumes: - - name: custom-tls-dns-combined-ca-bundle - secret: - secretName: combined-ca-bundle - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackansibleee_cr: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls-ovrd + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: tls-dns-ips + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: tls-dns-ips + edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns] + + + imagePullPolicy: Always + name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE -metadata: - name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls - namespace: openstack-kuttl-tests - ownerReferences: - - apiVersion: dataplane.openstack.org/v1beta1 - kind: OpenStackDataPlaneDeployment - name: openstack-edpm-tls-ovrd -spec: - backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 -status: - JobStatus: Succeeded - conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady ---- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackansibleee_cr: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls-ovrd + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: custom-tls-dns + osaee: "true" name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls namespace: openstack-kuttl-tests ownerReferences: - apiVersion: dataplane.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true kind: OpenStackDataPlaneDeployment name: openstack-edpm-tls-ovrd spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-openstack-edpm-tls - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + job-name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackansibleee_cr: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + openstackdataplanedeployment: openstack-edpm-tls-ovrd + openstackdataplanenodeset: openstack-edpm-tls + openstackdataplaneservice: custom-tls-dns + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep 1 + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: openstack-edpm-tls + edpm_service_type: custom-tls-dns + edpm_services_override: [install-certs-ovrd tls-dns-ips custom-tls-dns] + + + imagePullPolicy: Always + name: custom-tls-dns-openstack-edpm-tls-ovrd-openstack-edpm-tls + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: openstack-edpm-tls + serviceAccountName: openstack-edpm-tls + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-openstack-edpm-tls status: - JobStatus: Succeeded conditions: - - message: Job completed - reason: Ready - status: "True" - type: Ready - - message: Job completed - reason: Ready - status: "True" - type: JobReady + - status: "True" + type: Complete + ready: 0 + succeeded: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml b/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml index 21897befd..67cb57e81 100644 --- a/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-extramounts/00-assert.yaml @@ -27,9 +27,17 @@ spec: claimName: edpm-ansible readOnly: true --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: test-service-edpm-extramounts-edpm-extramounts + openstackansibleee_cr: test-service-edpm-extramounts-edpm-extramounts + openstackdataplanedeployment: edpm-extramounts + openstackdataplanenodeset: edpm-extramounts + openstackdataplaneservice: test-service + osaee: "true" name: test-service-edpm-extramounts-edpm-extramounts namespace: openstack-kuttl-tests ownerReferences: @@ -39,33 +47,92 @@ metadata: kind: OpenStackDataPlaneDeployment name: edpm-extramounts spec: - extraMounts: - - extraVolType: edpm-ansible - mounts: - - mountPath: /usr/share/ansible/collections/ansible_collections/osp/edpm - name: edpm-ansible - volumes: - - name: edpm-ansible - persistentVolumeClaim: - claimName: edpm-ansible - readOnly: true - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-extramounts + backoffLimit: 6 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: test-service-edpm-extramounts-edpm-extramounts + job-name: test-service-edpm-extramounts-edpm-extramounts + openstackansibleee_cr: test-service-edpm-extramounts-edpm-extramounts + openstackdataplanedeployment: edpm-extramounts + openstackdataplanenodeset: edpm-extramounts + openstackdataplaneservice: test-service + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - test.yml + - -i + - test-service-edpm-extramounts-edpm-extramounts + env: + - name: RUNNER_PLAYBOOK + value: |2+ + + test.yml + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-extramounts + edpm_service_type: test-service + + + imagePullPolicy: Always + name: test-service-edpm-extramounts-edpm-extramounts + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /usr/share/ansible/collections/ansible_collections/osp/edpm + name: edpm-ansible + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-extramounts + serviceAccountName: edpm-extramounts + terminationGracePeriodSeconds: 30 + volumes: + - name: edpm-ansible + persistentVolumeClaim: + claimName: edpm-ansible + readOnly: true + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-extramounts +status: + active: 1 + ready: 0 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml b/tests/kuttl/tests/dataplane-service-config/00-assert.yaml index 2f7e527ab..5c8256cbf 100644 --- a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-service-config/00-assert.yaml @@ -6,9 +6,18 @@ collectors: command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack name: operator-logs --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + generation: 1 + labels: + app: openstackansibleee + job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: kuttl-service + osaee: "true" name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -18,109 +27,165 @@ metadata: kind: OpenStackDataPlaneDeployment name: edpm-compute-no-nodes spec: - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" backoffLimit: 6 - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /var/lib/openstack/configs/kuttl-service/00-ansibleVars - subPath: 00-ansibleVars - - mountPath: /var/lib/openstack/configs/kuttl-service/00-kuttl-service.conf - subPath: 00-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/01-kuttl-service.conf - subPath: 01-kuttl-service.conf - volumes: - - configMap: - items: - - key: 00-ansibleVars - path: 00-ansibleVars - name: kuttl-service-cm-0 - - configMap: - items: - - key: 00-kuttl-service.conf - path: 00-kuttl-service.conf - name: kuttl-service-cm-0 - - configMap: - items: - - key: 01-kuttl-service.conf - path: 01-kuttl-service.conf - name: kuttl-service-cm-0 - - mounts: - - mountPath: /var/lib/openstack/configs/kuttl-service/01-ansibleVars - subPath: 01-ansibleVars - - mountPath: /var/lib/openstack/configs/kuttl-service/10-kuttl-service.conf - subPath: 10-kuttl-service.conf - - mountPath: /var/lib/openstack/configs/kuttl-service/20-kuttl-service.conf - subPath: 20-kuttl-service.conf - volumes: - - configMap: - items: - - key: 01-ansibleVars - path: 01-ansibleVars - name: kuttl-service-cm-1 - - configMap: - items: - - key: 10-kuttl-service.conf - path: 10-kuttl-service.conf - name: kuttl-service-cm-1 - - configMap: - items: - - key: 20-kuttl-service.conf - path: 20-kuttl-service.conf - name: kuttl-service-cm-1 - - mounts: - - mountPath: /var/lib/openstack/configs/kuttl-service/30-kuttl-service.conf - subPath: 30-kuttl-service.conf - volumes: - - configMap: - items: - - key: 30-kuttl-service.conf - path: 30-kuttl-service.conf - name: kuttl-service-cm-2 - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - name: openstackansibleee - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Sleep - command: sleep infinity - delegate_to: localhost - preserveJobs: true - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: kuttl-service + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Sleep + command: sleep infinity + delegate_to: localhost + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: kuttl-service + + + imagePullPolicy: Always + name: kuttl-service-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /var/lib/openstack/configs/kuttl-service/00-ansibleVars + name: kuttl-service-cm-0-0 + subPath: 00-ansibleVars + - mountPath: /var/lib/openstack/configs/kuttl-service/00-kuttl-service.conf + name: kuttl-service-cm-0-1 + subPath: 00-kuttl-service.conf + - mountPath: /var/lib/openstack/configs/kuttl-service/01-kuttl-service.conf + name: kuttl-service-cm-0-2 + subPath: 01-kuttl-service.conf + - mountPath: /var/lib/openstack/configs/kuttl-service/01-ansibleVars + name: kuttl-service-cm-1-0 + subPath: 01-ansibleVars + - mountPath: /var/lib/openstack/configs/kuttl-service/10-kuttl-service.conf + name: kuttl-service-cm-1-1 + subPath: 10-kuttl-service.conf + - mountPath: /var/lib/openstack/configs/kuttl-service/20-kuttl-service.conf + name: kuttl-service-cm-1-2 + subPath: 20-kuttl-service.conf + - mountPath: /var/lib/openstack/configs/kuttl-service/30-kuttl-service.conf + name: kuttl-service-cm-2-0 + subPath: 30-kuttl-service.conf + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + defaultMode: 420 + items: + - key: 00-ansibleVars + path: 00-ansibleVars + name: kuttl-service-cm-0 + name: kuttl-service-cm-0-0 + - configMap: + defaultMode: 420 + items: + - key: 00-kuttl-service.conf + path: 00-kuttl-service.conf + name: kuttl-service-cm-0 + name: kuttl-service-cm-0-1 + - configMap: + defaultMode: 420 + items: + - key: 01-kuttl-service.conf + path: 01-kuttl-service.conf + name: kuttl-service-cm-0 + name: kuttl-service-cm-0-2 + - configMap: + defaultMode: 420 + items: + - key: 01-ansibleVars + path: 01-ansibleVars + name: kuttl-service-cm-1 + name: kuttl-service-cm-1-0 + - configMap: + defaultMode: 420 + items: + - key: 10-kuttl-service.conf + path: 10-kuttl-service.conf + name: kuttl-service-cm-1 + name: kuttl-service-cm-1-1 + - configMap: + defaultMode: 420 + items: + - key: 20-kuttl-service.conf + path: 20-kuttl-service.conf + name: kuttl-service-cm-1 + name: kuttl-service-cm-1-2 + - configMap: + defaultMode: 420 + items: + - key: 30-kuttl-service.conf + path: 30-kuttl-service.conf + name: kuttl-service-cm-2 + name: kuttl-service-cm-2-0 + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Running - conditions: - - message: Job in progress - reason: Requested - severity: Info - status: "False" - type: Ready - - message: Job in progress - reason: Requested - severity: Info - status: "False" - type: JobReady + active: 1 + ready: 1 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml b/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml index cb77b1109..9c765e896 100644 --- a/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-service-custom-image/00-assert.yaml @@ -54,9 +54,17 @@ status: status: "True" type: SetupReady --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: + labels: + app: openstackansibleee + job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + openstackansibleee_cr: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-no-nodes-custom-svc + openstackdataplaneservice: custom-img-svc + osaee: "true" name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc namespace: openstack-kuttl-tests ownerReferences: @@ -67,41 +75,86 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 6 - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-no-nodes-custom-svc - image: example.com/repo/runner-image:latest - name: openstackansibleee - restartPolicy: Never - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + job-name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + openstackansibleee_cr: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-no-nodes-custom-svc + openstackdataplaneservice: custom-img-svc + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + env: + - name: RUNNER_PLAYBOOK + value: |2+ + + playbook.yaml + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-no-nodes-custom-svc + edpm_service_type: custom-img-svc + + + image: example.com/repo/runner-image:latest + imagePullPolicy: Always + name: custom-img-svc-edpm-compute-no-nodes-edpm-no-nodes-custom-svc + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-no-nodes-custom-svc + serviceAccountName: edpm-no-nodes-custom-svc + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-no-nodes-custom-svc status: - JobStatus: Running - conditions: - - message: Job in progress - reason: Requested - severity: Info - status: "False" - type: Ready - - message: Job in progress - reason: Requested - severity: Info - status: "False" - type: JobReady + active: 1 + ready: 0 + terminating: 0 + uncountedTerminatedPods: {} diff --git a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml b/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml index b27179bda..a07dc6272 100644 --- a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml @@ -6,14 +6,17 @@ collectors: command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack name: operator-logs --- -apiVersion: ansibleee.openstack.org/v1beta1 -kind: OpenStackAnsibleEE +apiVersion: batch/v1 +kind: Job metadata: - generation: 1 labels: + app: openstackansibleee + job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes openstackdataplanedeployment: edpm-compute-no-nodes openstackdataplanenodeset: edpm-compute-no-nodes openstackdataplaneservice: failed-service + osaee: "true" name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes namespace: openstack-kuttl-tests ownerReferences: @@ -24,64 +27,95 @@ metadata: name: edpm-compute-no-nodes spec: backoffLimit: 3 - env: - - name: ANSIBLE_FORCE_COLOR - value: "True" - envConfigMapName: openstack-aee-default-env - extraMounts: - - mounts: - - mountPath: /runner/env/ssh_key - name: ssh-key - subPath: ssh_key - - mountPath: /runner/inventory/hosts - name: inventory - subPath: inventory - volumes: - - name: ssh-key - secret: - items: - - key: ssh-privatekey - path: ssh_key - secretName: dataplane-ansible-ssh-private-key-secret - - name: inventory - secret: - items: - - key: inventory - path: inventory - secretName: dataplanenodeset-edpm-compute-no-nodes - extraVars: - edpm_override_hosts: edpm-compute-no-nodes - edpm_service_type: failed-service - name: openstackansibleee - playbookContents: | - - hosts: localhost - gather_facts: no - name: kuttl play - tasks: - - name: Copy absent file - ansible.builtin.shell: | - set -euxo pipefail - cp absent failed_op - preserveJobs: true - restartPolicy: Never - serviceAccountName: edpm-compute-no-nodes - uid: 1001 + completionMode: NonIndexed + completions: 1 + manualSelector: false + parallelism: 1 + podReplacementPolicy: TerminatingOrFailed + suspend: false + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[]' + creationTimestamp: null + labels: + app: openstackansibleee + batch.kubernetes.io/job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + job-name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackansibleee_cr: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + openstackdataplanedeployment: edpm-compute-no-nodes + openstackdataplanenodeset: edpm-compute-no-nodes + openstackdataplaneservice: failed-service + osaee: "true" + spec: + containers: + - args: + - ansible-runner + - run + - /runner + - -p + - playbook.yaml + - -i + - failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + env: + - name: ANSIBLE_FORCE_COLOR + value: "True" + - name: RUNNER_PLAYBOOK + value: |2+ + + - hosts: localhost + gather_facts: no + name: kuttl play + tasks: + - name: Copy absent file + ansible.builtin.shell: | + set -euxo pipefail + cp absent failed_op + + + - name: RUNNER_EXTRA_VARS + value: |2+ + + edpm_override_hosts: edpm-compute-no-nodes + edpm_service_type: failed-service + + + imagePullPolicy: Always + name: failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /runner/env/ssh_key + name: ssh-key + subPath: ssh_key + - mountPath: /runner/inventory/hosts + name: inventory + subPath: inventory + dnsPolicy: ClusterFirst + restartPolicy: OnFailure + schedulerName: default-scheduler + securityContext: {} + serviceAccount: edpm-compute-no-nodes + serviceAccountName: edpm-compute-no-nodes + terminationGracePeriodSeconds: 30 + volumes: + - name: ssh-key + secret: + defaultMode: 420 + items: + - key: ssh-privatekey + path: ssh_key + secretName: dataplane-ansible-ssh-private-key-secret + - name: inventory + secret: + defaultMode: 420 + items: + - key: inventory + path: inventory + secretName: dataplanenodeset-edpm-compute-no-nodes status: - JobStatus: Failed - conditions: - - message: 'Job error occurred Internal error occurred: Job has reached the specified - backoff limit. Check job logs' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: Ready - - message: 'Job error occurred Internal error occurred: Job has reached the specified - backoff limit. Check job logs' - reason: BackoffLimitExceeded - severity: Error - status: "False" - type: JobReady - observedGeneration: 1 + failed: 1 --- apiVersion: dataplane.openstack.org/v1beta1 kind: OpenStackDataPlaneNodeSet @@ -102,14 +136,14 @@ status: conditions: - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: Error severity: Error status: "False" type: Ready - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: Error severity: Error status: "False" @@ -138,14 +172,14 @@ status: edpm-compute-no-nodes: - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False" type: NodeSetDeploymentReady - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False" @@ -167,14 +201,14 @@ status: conditions: - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False" type: Ready - message: 'Deployment error occurred nodeSet: edpm-compute-no-nodes error: backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False" @@ -187,14 +221,14 @@ status: edpm-compute-no-nodes: - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False" type: NodeSetDeploymentReady - message: 'Deployment error occurred in failed-service service error backoff limit reached for execution.name failed-service-edpm-compute-no-nodes-edpm-compute-no-nodes - execution.namespace openstack-kuttl-tests execution.status.jobstatus: Failed' + execution.namespace openstack-kuttl-tests execution.condition.message: Job has reached the specified backoff limit' reason: BackoffLimitExceeded severity: Error status: "False"