Page MenuHomeDevCentral
Differential D2581

Simplify network configuration
ClosedPublic
Actions

Authored by dereckson on Mar 7 2022, 22:25.
Tags
None
Referenced Files
F26156638: D2581.id6598.diff
Mon, Apr 20, 13:23
F26138966: D2581.id6596.diff
Mon, Apr 20, 10:35
F26138872: D2581.id6544.diff
Mon, Apr 20, 10:35
Unknown Object (File)
Mon, Apr 20, 09:14
Unknown Object (File)
Mon, Apr 20, 09:11
Unknown Object (File)
Sun, Apr 19, 05:23
Unknown Object (File)
Sat, Apr 18, 22:26
Unknown Object (File)
Sat, Apr 18, 22:19
View All Files
Subscribers
None

Details

Reviewers
dereckson
Commits
rOPSc4c5fe43bfca: Simplify network configuration
Summary

The network unit wants to configure "IPv4", "IPv6" and "private interface".

The private interface configuration is an IPv4, so there is redundant code
to maintain there.

This change introduces an interface dictionary in the nodes pillar where
the ipv4/ipv6/private configuration is migrated.

MOTD wants a public IPV4 and a gateway, so the node.resolve_network()
parses our configuration to provide that and return private IPv4 for
servers not assigned a public address. The first interface wins.

Elsewhere, configuration won't be changed as the grain ipv4 is used.

Test Plan

Apply to Dwellers and router-001

Diff Detail

Repository
rOPS Nasqueron Operations
Lint
Lint Passed
SeverityLocationCodeMessage
Advice_modules/node.py:238F821flake8 F821
Unit
No Test Coverage
Branch
network
Build Status
Buildable 4102
Build 4354: arc lint + arc unit

Event Timeline

dereckson created this revision.Mar 7 2022, 22:25
dereckson held this revision as a draft.
Harbormaster completed remote builds in B4042: Diff 6519.Mar 7 2022, 22:25
dereckson added a comment.Mar 7 2022, 22:28

Next: we need to edit roles/core/network to use this new data structure.

dereckson updated this revision to Diff 6543.Mar 13 2022, 21:34

gateway, assign directly non-router IP to drake/24

Harbormaster completed remote builds in B4056: Diff 6543.Mar 13 2022, 21:34
dereckson updated this revision to Diff 6544.Mar 13 2022, 21:39

Add blank lines to adhere to PEP-8. -test_paas_docker

Harbormaster completed remote builds in B4057: Diff 6544.Mar 13 2022, 21:39
dereckson updated this revision to Diff 6545.Mar 14 2022, 00:10

canonical IP

Harbormaster completed remote builds in B4058: Diff 6545.Mar 14 2022, 00:10
dereckson added a child revision: D2594: Reconfigure GRE tunnels.Mar 14 2022, 00:12
dereckson mentioned this in D2595: Refactor routes configuration.Mar 14 2022, 18:17
dereckson retitled this revision from WIP: simplify network configuration to Simplify network configuration.Mar 20 2022, 21:53
dereckson updated this revision to Diff 6596.Mar 20 2022, 21:54

Rebase. Apply to IPv6. Remove private.

Harbormaster completed remote builds in B4095: Diff 6596.Mar 20 2022, 21:54
dereckson updated this revision to Diff 6597.Mar 20 2022, 21:55

Reformat with black

Harbormaster completed remote builds in B4096: Diff 6597.Mar 20 2022, 21:55
dereckson updated this revision to Diff 6598.Mar 20 2022, 21:56

Fix whiteline

Harbormaster completed remote builds in B4097: Diff 6598.Mar 20 2022, 21:56
dereckson updated this revision to Diff 6599.Mar 20 2022, 22:25

Use resolve_network() in OpenSearch

Harbormaster completed remote builds in B4098: Diff 6599.Mar 20 2022, 22:25
dereckson updated this revision to Diff 6600.Mar 20 2022, 22:29

Use 255.255.255.240 (/28) for Drake intraNought

Harbormaster completed remote builds in B4099: Diff 6600.Mar 20 2022, 22:29
dereckson updated this revision to Diff 6605.Mar 21 2022, 00:16

Indent IPv6. Fix for loop in Python.

Harbormaster completed remote builds in B4102: Diff 6605.Mar 21 2022, 00:16
dereckson updated this revision to Diff 6606.Mar 21 2022, 01:38

Generalize netmasks

Harbormaster completed remote builds in B4103: Diff 6606.Mar 21 2022, 01:38
dereckson updated this revision to Diff 6607.Mar 21 2022, 01:54

Arguments in ipv4, netmasks

Harbormaster completed remote builds in B4104: Diff 6607.Mar 21 2022, 01:54
dereckson published this revision for review.Mar 21 2022, 20:12
dereckson accepted this revision.Mar 21 2022, 20:15
This revision is now accepted and ready to land.Mar 21 2022, 20:15
Closed by commit rOPSc4c5fe43bfca: Simplify network configuration (authored by dereckson). · Explain WhyMar 21 2022, 20:16
This revision was automatically updated to reflect the committed changes.
dereckson added a commit: rOPSc4c5fe43bfca: Simplify network configuration.

Revision Contents
Changeset List

PathSize
_modules/
41 lines
3 lines
_tests/
data/
17 lines
modules/
47 lines
pillar/
nodes/
152 lines
roles/
core/
motd/
2 lines
network/
files/
Debian/
FreeBSD/
10-net.jinja
netif_ipv4.rc
15 lines
FreeBSD/
6 lines
RedHat/
ifcfg
ifcfg-private
6 lines
3 lines
26 lines
34 lines
34 lines

Diff 6605

View Options

_modules/node.py

Loading...
View Options

_modules/opensearch.py

Loading...
View Options

_tests/data/forests.yaml

Loading...
View Options

_tests/modules/test_node.py

Loading...
View Options

pillar/nodes/nodes.sls

Loading...
View Options

roles/core/motd/init.sls

Loading...
View Options

roles/core/network/files/Debian/10-net.jinja

Loading...
View Options

roles/core/network/files/FreeBSD/netif_ipv4.rc

Loading...
View Options

roles/core/network/files/RedHat/ifcfg

Loading...
View Options

roles/core/network/files/RedHat/ifcfg-private

Loading...
View Options

roles/core/network/init.sls

Loading...
View Options

roles/core/network/ipv4.sls

Loading...
View Options

roles/core/network/ipv6.sls

Loading...
View Options

roles/core/network/map.jinja

Loading...
View Options

roles/core/network/private.sls

Loading...
Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator