Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pre/post Ceph servicesOverride in uni05epsilon HCI #358

Merged

Conversation

fultonj
Copy link
Contributor

@fultonj fultonj commented Aug 6, 2024

This patch applies very similar changes as the commit below for the same reasons but to uni05epsilon.

commit 3ebad70

Jira: https://issues.redhat.com/browse/OSPRH-9222

This patch applies very similar changes as the commit
below for the same reasons but to uni05epsilon.

commit 3ebad70

Jira: https://issues.redhat.com/browse/OSPRH-9222

Signed-off-by: John Fulton <[email protected]>
@openshift-ci openshift-ci bot requested review from cjeanner and raukadah August 6, 2024 17:52
@openshift-ci openshift-ci bot added the approved label Aug 6, 2024
@fultonj
Copy link
Contributor Author

fultonj commented Aug 6, 2024

Simple testing.

1. PRE deployment

[fultonj@runcible uni05epsilon{OSPRH-9222}]$ kustomize build edpm-pre-ceph/deployment
apiVersion: dataplane.openstack.org/v1beta1
kind: OpenStackDataPlaneDeployment
metadata:
  name: edpm-deployment-pre-ceph
  namespace: openstack
spec:
  nodeSets:
  - openstack-edpm
  servicesOverride:
  - bootstrap
  - download-cache
  - configure-network
  - validate-network
  - install-os
  - ceph-hci-pre
  - configure-os
  - ssh-known-hosts
  - run-os
  - reboot-os
[fultonj@runcible uni05epsilon{OSPRH-9222}]$ 


2. POST deployment

[fultonj@runcible uni05epsilon{OSPRH-9222}]$ kustomize build deployment
apiVersion: dataplane.openstack.org/v1beta1
kind: OpenStackDataPlaneDeployment
metadata:
  name: edpm-deployment-post-ceph
  namespace: openstack
spec:
  nodeSets:
  - openstack-edpm
  servicesOverride:
  - install-certs
  - ceph-client
  - ovn
  - neutron-metadata
  - libvirt
  - nova-custom
[fultonj@runcible uni05epsilon{OSPRH-9222}]$ 


3. PRE nodeset

[fultonj@runcible uni05epsilon{OSPRH-9222}]$ kustomize build edpm-pre-ceph/nodeset
...
  services:
  - bootstrap
  - download-cache
  - configure-network
  - validate-network
  - install-os
  - ceph-hci-pre
  - configure-os
  - ssh-known-hosts
  - run-os
  - reboot-os
  - install-certs
  - ceph-client
  - ovn
  - neutron-metadata
  - libvirt
[fultonj@runcible uni05epsilon{OSPRH-9222}]$ 

4. POST nodeset

[fultonj@runcible uni05epsilon{OSPRH-9222}]$ kustomize build
...
  services:
  - bootstrap
  - download-cache
  - configure-network
  - validate-network
  - install-os
  - ceph-hci-pre
  - configure-os
  - ssh-known-hosts
  - run-os
  - reboot-os
  - install-certs
  - ceph-client
  - ovn
  - neutron-metadata
  - libvirt
  - nova-custom
---
[fultonj@runcible uni05epsilon{OSPRH-9222}]$ 

@fultonj
Copy link
Contributor Author

fultonj commented Aug 6, 2024

Note that it has a slightly different service list than va/hci

[fultonj@runcible uni05epsilon{main}]$ yq -o=json '.data.nodeset.services' edpm-pre-ceph/nodeset/values.yaml
[
  "bootstrap",
  "download-cache",
  "configure-network",
  "validate-network",
  "install-os",
  "ceph-hci-pre",
  "configure-os",
  "ssh-known-hosts",
  "run-os",
  "reboot-os"
]
[fultonj@runcible uni05epsilon{main}]$ yq -o=json '.data.nodeset.services' values.yaml
[
  "install-certs",
  "ceph-client",
  "ovn",
  "neutron-metadata",
  "libvirt",
  "nova-custom"
]
[fultonj@runcible uni05epsilon{main}]$ 

@fultonj fultonj added the needs-18.0.0-proposed-cherry-pick Owner should cherry pick this PR to 18.0.0-proposed after it merges label Aug 6, 2024
@fultonj
Copy link
Contributor Author

fultonj commented Aug 6, 2024

@sdatko fyi

@abays abays added the needs-testing Testing proof is required prior to merge label Aug 12, 2024
@fultonj fultonj removed the needs-18.0.0-proposed-cherry-pick Owner should cherry pick this PR to 18.0.0-proposed after it merges label Aug 12, 2024
@sdatko
Copy link
Contributor

sdatko commented Aug 13, 2024

Tested – we are fine to merge (I do not see difference in tests)

@abays abays added testing-complete Testing is completed and ready for final reviews and removed needs-testing Testing proof is required prior to merge labels Aug 13, 2024
Copy link
Contributor

@abays abays left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

Copy link

openshift-ci bot commented Aug 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, fultonj

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit de3eca1 into openstack-k8s-operators:main Aug 13, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm testing-complete Testing is completed and ready for final reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants