search

openshift / openshift-ansible

Install and config an OpenShift 3.x cluster
https://try.openshift.com
Apache License 2.0
2.19k stars 2.31k forks source link

ipsec: edit /etc/ipsec.conf to modify nssdir #12482

Closed yuvalk closed 9 months ago

yuvalk commented 9 months ago

this is needed to align with where RHCOS stores nss db

openshift-ci[bot] commented 9 months ago

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: yuvalk Once this PR has been reviewed and has the lgtm label, please assign patrickdillon for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files: - **[OWNERS](https://github.com/openshift/openshift-ansible/blob/master/OWNERS)** Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci[bot] commented 9 months ago

@yuvalk: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-workers-rhel8 80c0dedb21b93f58367cd40f642322b1bae5d398 link true /test e2e-aws-workers-rhel8

Full PR test history. Your PR dashboard.

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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
patrickdillon commented 9 months ago

/cherry-pick release-4.15

openshift-cherrypick-robot commented 9 months ago

@patrickdillon: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/openshift-ansible/pull/12482#issuecomment-1932731665): >/cherry-pick release-4.15 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 9 months ago

@patrickdillon: #12482 failed to apply on top of branch "release-4.15":

Applying: ipsec: edit /etc/ipsec.conf to modify nssdir
Using index info to reconstruct a base tree...
M   roles/openshift_node/tasks/install.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_node/tasks/install.yml
CONFLICT (content): Merge conflict in roles/openshift_node/tasks/install.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ipsec: edit /etc/ipsec.conf to modify nssdir
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/openshift-ansible/pull/12482#issuecomment-1932731665): >/cherry-pick release-4.15 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.