Skip to content

Commit 1caa932

Browse files
committed
Fix compatibility with MCE 2.3
1 parent 293a4fd commit 1caa932

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

edge/install-config-sno-example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ platform:
7373
interfaces:
7474
- name: eno1
7575
type: ethernet
76-
macAddress: <nic1_mac_address>
76+
mac-address: <nic1_mac_address>
7777
state: up
7878
ipv4:
7979
address:

edge/install-config-standard-example.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ platform:
7474
interfaces:
7575
- name: eno1
7676
type: ethernet
77-
macAddress: <nic1_mac_address>
77+
mac-address: <nic1_mac_address>
7878
state: up
7979
ipv4:
8080
enabled: true
@@ -94,7 +94,7 @@ platform:
9494
interfaces:
9595
- name: eno1
9696
type: ethernet
97-
macAddress: <nic1_mac_address>
97+
mac-address: <nic1_mac_address>
9898
state: up
9999
ipv4:
100100
enabled: true
@@ -114,7 +114,7 @@ platform:
114114
interfaces:
115115
- name: eno1
116116
type: ethernet
117-
macAddress: <nic1_mac_address>
117+
mac-address: <nic1_mac_address>
118118
state: up
119119
ipv4:
120120
enabled: true
@@ -134,7 +134,7 @@ platform:
134134
interfaces:
135135
- name: eno1
136136
type: ethernet
137-
macAddress: <nic1_mac_address>
137+
mac-address: <nic1_mac_address>
138138
state: up
139139
ipv4:
140140
enabled: true
@@ -154,7 +154,7 @@ platform:
154154
interfaces:
155155
- name: eno1
156156
type: ethernet
157-
macAddress: <nic1_mac_address>
157+
mac-address: <nic1_mac_address>
158158
state: up
159159
ipv4:
160160
enabled: true

edge/roles/edge_install/tasks/get_relocatable_ip.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
block:
1111
- name: Create IPv4 address line
1212
ansible.builtin.set_fact:
13-
bash_item: "addresses_ipv4['{{ item.macAddress }}']='{{ relocatable_ipv4_subnet | ansible.utils.nthhost(interface_number | int) }}/{{ relocatable_ipv4_subnet | ansible.utils.ipaddr('prefix') }}'\n"
13+
bash_item: "addresses_ipv4['{{ item['mac-address'] }}']='{{ relocatable_ipv4_subnet | ansible.utils.nthhost(interface_number | int) }}/{{ relocatable_ipv4_subnet | ansible.utils.ipaddr('prefix') }}'\n"
1414

1515
- name: Append IPv4 to address list
1616
ansible.builtin.set_fact:
@@ -21,7 +21,7 @@
2121
block:
2222
- name: Create IPv6 address line
2323
ansible.builtin.set_fact:
24-
bash_item: "addresses_ipv6['{{ item.macAddress }}']='{{ relocatable_ipv6_subnet | ansible.utils.nthhost(interface_number | int) }}/{{ relocatable_ipv6_subnet | ansible.utils.ipaddr('prefix') }}'\n"
24+
bash_item: "addresses_ipv6['{{ item['mac-address'] }}']='{{ relocatable_ipv6_subnet | ansible.utils.nthhost(interface_number | int) }}/{{ relocatable_ipv6_subnet | ansible.utils.ipaddr('prefix') }}'\n"
2525

2626
- name: Append IPv6 to address list
2727
ansible.builtin.set_fact:

edge/roles/edge_install/templates/NMStateConfig.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ spec:
1212
{% for interface in nmstate_host.networkConfig.interfaces %}
1313
{% if interface.type == "ethernet" %}
1414
- name: "{{ interface.name }}"
15-
macAddress: "{{ interface.macAddress }}"
15+
macAddress: "{{ interface['mac-address'] }}"
1616
{% endif %}
1717
{% endfor %}

0 commit comments

Comments
 (0)