search

openstack-k8s-operators / edpm-ansible

External Dataplane Management Ansible Playbooks
https://openstack-k8s-operators.github.io/edpm-ansible/
Apache License 2.0
9 stars 65 forks source link

Change pattern for detecting pre-adopted versus edpm nodes #696

Closed ciecierski closed 2 months ago

ciecierski commented 2 months ago

Change edpm_reboot_old_tripleo_node_config_dir to check for tripleo files in /var/lib/config-data/puppet-generated instead of /var/lib/config-data. Path /var/lib/config-data is still being used in edpm for storing configs whereas puppet-generated is suppose to be used only in 17/wallaby. This will make sure for greenfield auto mode is back working, but reboot is skipped on tripleo nodes during adoption.

Resolves: OSPRH-8415

ciecierski commented 2 months ago

In tripleo-ansible there are still roles that rely on /var/lib/config-data/ansible-generated.

Those might conflict with edpm-ansible, and need to be discovered as "old" ones instead. The only option I see - never use /var/lib/config-data/ansible-generated in edpm-ansible

I switched to /var/lib/config-data/puppet-generated. This is not used in edpm for 100%. For ansible-generated true, still some edpm-ansible roles use it and some /var/lib/edpm-config

bogdando commented 2 months ago

I switched to /var/lib/config-data/puppet-generated. This is not used in edpm for 100%. For ansible-generated true, still some edpm-ansible roles use it and some /var/lib/edpm-config

OK, this should work as long there would be no /var/lib/config-data/ansible-generated w/o puppet-generated in the legacy environment, and to my knowledge, that is always true. So indeed, we can ignore the fact that /var/lib/config-data/ansible-generated may be used by osp AND rhoso for configs rendering

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bogdando, ciecierski, jistr, jpodivin

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: - ~~[OWNERS](https://github.com/openstack-k8s-operators/edpm-ansible/blob/main/OWNERS)~~ [jpodivin] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
softwarefactory-project-zuul[bot] commented 2 months ago

Build failed (check pipeline). Post recheck (without leading slash) to rerun all jobs. Make sure the failure cause has been resolved before you rerun jobs.

https://review.rdoproject.org/zuul/buildset/c5af42d4b82f41a888f3697281fe2464

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 3h 04m 54s :heavy_check_mark: podified-multinode-edpm-deployment-crc SUCCESS in 1h 49m 06s :x: cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 5m 39s :heavy_check_mark: edpm-ansible-molecule-edpm_bootstrap SUCCESS in 7m 13s :heavy_check_mark: edpm-ansible-molecule-edpm_podman SUCCESS in 6m 23s :heavy_check_mark: edpm-ansible-molecule-edpm_module_load SUCCESS in 5m 32s :heavy_check_mark: edpm-ansible-molecule-edpm_kernel SUCCESS in 11m 19s :heavy_check_mark: edpm-ansible-molecule-edpm_libvirt SUCCESS in 9m 40s :heavy_check_mark: edpm-ansible-molecule-edpm_nova SUCCESS in 10m 43s :heavy_check_mark: edpm-ansible-molecule-edpm_frr SUCCESS in 7m 04s :heavy_check_mark: edpm-ansible-molecule-edpm_iscsid SUCCESS in 5m 07s :heavy_check_mark: edpm-ansible-molecule-edpm_ovn_bgp_agent SUCCESS in 7m 45s :heavy_check_mark: edpm-ansible-molecule-edpm_ovs SUCCESS in 12m 57s :heavy_check_mark: edpm-ansible-molecule-edpm_tripleo_cleanup SUCCESS in 4m 14s

ciecierski commented 2 months ago

recheck

ciecierski commented 2 months ago

/cherry-pick 18.0.0-proposed

openshift-cherrypick-robot commented 2 months ago

@ciecierski: new pull request created: #700

In response to [this](https://github.com/openstack-k8s-operators/edpm-ansible/pull/696#issuecomment-2230519889): >/cherry-pick 18.0.0-proposed Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.