Skip to content

Fix/3007.x/missing debian ip options #68436

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: 3007.x
Choose a base branch
from
Open

Fix/3007.x/missing debian ip options #68436

wants to merge 2 commits into from
+59 −2

Conversation

@perhallgren
Copy link

@perhallgren perhallgren commented Oct 28, 2025

What does this PR do?

For debian-ip, not all options get rendered in the final interfaces file.

The valid_opts list must be a superset of the keys of the optmap map for the mappted options to get rendered.

This commit adds the missing options to the valid_opts list.

What issues does this PR fix or reference?

Fixes #58210 and #57820.

Previous Behavior

Given

    enp0sbeef:
        ----------
        network:
            |_
              ----------
              enabled:
                  True
            |_
              ----------
              type:
                  eth
            |_
              ----------
              proto:
                  static
            |_
              ----------
              ipaddr:
                  10.0.0.25/24
            |_
              ----------
              post_up_cmds:
                  - echo "hi"

/etc/network/interfaces

    auto enp0sbeef
    iface enp0sbeef inet static
        address 10.0.0.25/24

New Behavior

Given

    enp0sbeef:
        ----------
        network:
            |_
              ----------
              enabled:
                  True
            |_
              ----------
              type:
                  eth
            |_
              ----------
              proto:
                  static
            |_
              ----------
              ipaddr:
                  10.0.0.25/24
            |_
              ----------
              post_up_cmds:
                  - echo "hi"

/etc/network/interfaces

    auto enp0sbeef
    iface enp0sbeef inet static
        address 10.0.0.25/24
        post-up echo "hi"

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@perhallgren
fix(debian-ip): include all mapped options as valid options
e634a77 
As reported in saltstack#58210 and
saltstack#57820, not all options get rendered in
the final `interfaces` file.

The valid_opts list must be a superset of the keys of the optmap map for the
mappted options to get rendered.

This commit adds the missing options to the valid_opts list.
@perhallgren
test(debian-ip): add tests for all valid_opts
8d74a7e 
Tests that all mapped options are also in valid_opts.
@perhallgren perhallgren requested a review from a team as a code owner October 28, 2025 10:31
@perhallgren perhallgren changed the base branch from master to 3007.x October 28, 2025 10:31
@perhallgren perhallgren mentioned this pull request Oct 28, 2025
Merged
3 tasks
@twangboy twangboy added the test:full Run the full test suite label Oct 31, 2025
@twangboy twangboy added this to the Chlorine v3007.9 milestone Oct 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@twangboy twangboy twangboy approved these changes

Assignees

No one assigned

Labels

test:full Run the full test suite

Projects

None yet

Milestone

Chlorine v3007.9

Development

Successfully merging this pull request may close these issues.

[BUG] some broken options in debian_eth.jinja for /etc/network/interfaces

2 participants

@perhallgren @twangboy