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

Bug 1798637: baremetal: IPv6 add dhcp-duid to NetworkManager config #1395

Merged
merged 1 commit into from Jan 24, 2020

Conversation

hardys
Copy link
Contributor

@hardys hardys commented Jan 21, 2020

Adding ipv6.dhcp-duid=ll means we get a predictable
client ID so that reservations can be made on the
DHCP server - this is useful if you want to provide
the hostname via DHCP (although a reverse DNS lookup
should also work)

Reservations are also required to ensure the controlplane
IP of the masters won't ever change post-deployment
which will be necessary if the DNS lookup approach
is taken to set the hostnames.

- What I did

Updated the NetworkManager configuration, only for the baremetal (IPI) platform, so we specify the ipv6.dhcp-duid=ll option. This enables a predictable (mac derived) client ID/DUID when deploying in an IPv6 environment.

- How to verify it

If testing with dev-scripts you can check via virsh net-dhcp-leases baremetal - on baremetal you can check the client ID in the lease for the nic connected to the controlplane network (/var/lib/NetworkManager/dhclient6*.lease)

In both cases the controlplane network must be configured for single-stack ipv6, and there are some other PRs open to enable that e2e with the default OpenShift builds. openshift-metal3/dev-scripts#871 has some more details.

- Description for the changelog

Updated the NetworkManager configuration, for the baremetal (IPI) platform to specify the ipv6.dhcp-duid=ll option. This enables a predictable (mac derived) client ID/DUID.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 21, 2020
@hardys hardys changed the title baremetal add dhcp-duid to NetworkManager config baremetal: add dhcp-duid to NetworkManager config Jan 21, 2020
@hardys
Copy link
Contributor Author

hardys commented Jan 21, 2020

#1375 has some related discussion

@hardys hardys changed the title baremetal: add dhcp-duid to NetworkManager config baremetal: IPv6 add dhcp-duid to NetworkManager config Jan 21, 2020
@kikisdeliveryservice
Copy link
Contributor

PTAL

/assign @celebdor
/assign @bcrochet

@runcom
Copy link
Member

runcom commented Jan 22, 2020

/retest

@hardys
Copy link
Contributor Author

hardys commented Jan 22, 2020

/test e2e-gcp-upgrade

@rgolangh
Copy link
Contributor

Its time for a well established common configuration for all 3 baremetal, openstack, ovirt. Possibly more platforms will benefit from it, vsphere, libvirt, and so on. Question is how to properly have platforms opt-in to such common configuration. One way might be symbolic links - but then we need to solve templating:

cat template/shared/foo.conf
key="{{ .ControllerConfig.Infra.Status.PlatformStatus.PLATFORM.SomeValue}}"

ls -la template/ovirt/
lrwxrwxrw ../share/foo.conf

so PLATFORM can be resolved by the internal Platform

@runcom is there an issue on this topic? if not I'll open one

@hardys
Copy link
Contributor Author

hardys commented Jan 22, 2020

@rgolangh agreed figuring out how to de-duplicate this would be good

One way might be symbolic links - but then we need to solve templating:

If we can't solve the templating another approach would be to rework the dispatcher scripts to they are common to all platforms, but then source a per-platform file with the variables that are templated (and do nothing if such a file doesn't exist?)

@kikisdeliveryservice
Copy link
Contributor

Any reviews on this?

@celebdor @hardys @bcrochet

@bcrochet
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020
@hardys
Copy link
Contributor Author

hardys commented Jan 23, 2020

Any reviews on this?

@celebdor @hardys @bcrochet

This has been tested by several folks now via the https://github.com/openshift-kni/machine-config-operator/commits/4.3-ipv6 branch cc @russellb @derekhiggins - I think it's good to go provided @celebdor and @bcrochet agree

@runcom
Copy link
Member

runcom commented Jan 23, 2020

/retest

2 similar comments
@kikisdeliveryservice
Copy link
Contributor

/retest

@kikisdeliveryservice
Copy link
Contributor

/retest

@kikisdeliveryservice
Copy link
Contributor

also ping: @celebdor :)

@kikisdeliveryservice
Copy link
Contributor

@hardys looks like you need to rebase this PR as another changed the same yaml.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2020
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

Adding approval.
FYI: once you push your rebase, it'll clear the existing LGTM and you'll need another asap @hardys

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2020
Adding ipv6.dhcp-duid=ll means we get a predictable
client ID so that reservations can be made on the
DHCP server - this is useful if you want to provide
the hostname via DHCP (although a reverse DNS lookup
should also work)

Reservations are also required to ensure the controlplane
IP of the masters won't ever change post-deployment
which will be necessary if the DNS lookup approach
is taken to set the hostnames.
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 24, 2020
@celebdor
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2020
@derekhiggins
Copy link

/lgtm
works for me

@openshift-ci-robot
Copy link
Contributor

@derekhiggins: changing LGTM is restricted to collaborators

In response to this:

/lgtm
works for me

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bcrochet, celebdor, derekhiggins, hardys, kikisdeliveryservice

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 [kikisdeliveryservice]

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

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit e59d3db into openshift:master Jan 24, 2020
@hardys
Copy link
Contributor Author

hardys commented Jan 24, 2020

/cherrypick release-4.3

@openshift-cherrypick-robot

@hardys: #1395 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
CONFLICT (content): Merge conflict in templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
Patch failed at 0001 baremetal add dhcp-duid to NetworkManager config

In response to this:

/cherrypick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

@hardys: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 910a63c link /test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@hardys
Copy link
Contributor Author

hardys commented Feb 4, 2020

/cherrypick release-4.3

@openshift-cherrypick-robot

@hardys: #1395 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
CONFLICT (content): Merge conflict in templates/common/baremetal/files/baremetal-NetworkManager-kni-conf.yaml
Patch failed at 0001 baremetal add dhcp-duid to NetworkManager config

In response to this:

/cherrypick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@hardys
Copy link
Contributor Author

hardys commented Feb 5, 2020

/cherrypick release-4.3

@openshift-cherrypick-robot

@hardys: new pull request created: #1441

In response to this:

/cherrypick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@hardys
Copy link
Contributor Author

hardys commented Feb 5, 2020

/retitle Bug 1798637: baremetal: IPv6 add dhcp-duid to NetworkManager config

@openshift-ci-robot openshift-ci-robot changed the title baremetal: IPv6 add dhcp-duid to NetworkManager config Bug 1798637: baremetal: IPv6 add dhcp-duid to NetworkManager config Feb 5, 2020
@openshift-ci-robot
Copy link
Contributor

@hardys: All pull requests linked via external trackers have merged. Bugzilla bug 1798637 has been moved to the MODIFIED state.

In response to this:

Bug 1798637: baremetal: IPv6 add dhcp-duid to NetworkManager config

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

mandre added a commit to mandre/machine-config-operator that referenced this pull request Feb 18, 2020
Adding ipv6.dhcp-duid=ll means we get a predictable client ID so that
reservations can be made on the DHCP server - this is useful if you
want to provide the hostname via DHCP (although a reverse DNS lookup
should also work)

Reservations are also required to ensure the controlplane IP of the
masters won't ever change post-deployment which will be necessary if
the DNS lookup approach is taken to set the hostnames.

This ports the BM fix from
openshift#1395 to
OpenStack platform.
vrutkovs pushed a commit to vrutkovs/machine-config-operator that referenced this pull request Mar 1, 2020
Adding ipv6.dhcp-duid=ll means we get a predictable client ID so that
reservations can be made on the DHCP server - this is useful if you
want to provide the hostname via DHCP (although a reverse DNS lookup
should also work)

Reservations are also required to ensure the controlplane IP of the
masters won't ever change post-deployment which will be necessary if
the DNS lookup approach is taken to set the hostnames.

This ports the BM fix from
openshift#1395 to
OpenStack platform.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet