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.

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

OCPBUGS-8238: ztp: Remove incorrect macAddress field #1431

Merged
merged 1 commit into from
Mar 9, 2023
Merged

OCPBUGS-8238: ztp: Remove incorrect macAddress field #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion ztp/gitops-subscriptions/argocd/SNOExpansion.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ EOF
- name: eno1
type: ethernet
state: up
macAddress: "<MAC of the machine network interface>"
ipv4:
enabled: false
ipv6:
Expand Down
3 changes: 0 additions & 3 deletions ztp/gitops-subscriptions/argocd/example/siteconfig/example-3node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:11"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -97,7 +96,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:22"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -135,7 +133,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:33"
ipv4:
enabled: false
ipv6:
Expand Down
1 change: 0 additions & 1 deletion ztp/gitops-subscriptions/argocd/example/siteconfig/example-sno.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:11"
ipv4:
enabled: false
ipv6:
Expand Down
5 changes: 0 additions & 5 deletions ztp/gitops-subscriptions/argocd/example/siteconfig/example-standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:11"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -97,7 +96,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:22"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -135,7 +133,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:33"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -173,7 +170,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:44"
ipv4:
enabled: false
ipv6:
Expand Down Expand Up @@ -211,7 +207,6 @@ spec:
- name: eno1
type: ethernet
state: up
macAddress: "AA:BB:CC:DD:EE:55"
ipv4:
enabled: false
ipv6:
Expand Down
3 changes: 1 addition & 2 deletions ztp/ran-crd/site-config-cr-ex.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ spec:
- name: eth1
macAddress: 02:00:00:80:12:15
config:
# Example for the nmstate config. The interface names & macAddresses must match the defined interfaces above.
# Example for the nmstate config. The interface names must match the defined interfaces above.
interfaces:
- name: eno1
macAddress: 00:00:00:01:20:30
type: ethernet
ipv4:
enabled: true
Expand Down
1 change: 0 additions & 1 deletion ztp/siteconfig-generator-kustomize-plugin/testSiteConfig/site1-sno-du.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv4:
enabled: true
Expand Down
2 changes: 0 additions & 2 deletions ztp/siteconfig-generator-kustomize-plugin/testSiteConfig/site1-sno-expansion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv4:
enabled: true
Expand Down Expand Up @@ -144,7 +143,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv4:
enabled: true
Expand Down
1 change: 0 additions & 1 deletion ztp/siteconfig-generator-kustomize-plugin/testSiteConfig/site2-sno-du.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv6:
enabled: true
Expand Down
2 changes: 0 additions & 2 deletions ztp/siteconfig-generator-kustomize-plugin/testSiteConfig/site2-standard-du.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv6:
enabled: true
Expand Down Expand Up @@ -99,7 +98,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:40"
type: ethernet
ipv6:
enabled: true
Expand Down
2 changes: 0 additions & 2 deletions ztp/siteconfig-generator/siteConfig/siteConfigBuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv4:
enabled: true
Expand Down Expand Up @@ -135,7 +134,6 @@ spec:
config:
interfaces:
- name: eno1
macAddress: "00:00:00:01:20:30"
type: ethernet
ipv4:
enabled: true
Expand Down
1 change: 0 additions & 1 deletion ztp/siteconfig-generator/siteConfig/testdata/siteConfigTestOutput.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ spec:
- ipv4:
dhcp: false
enabled: true
macAddress: "00:00:00:01:20:30"
name: eno1
type: ethernet
interfaces:
Expand Down