[CORD-2677]
Use padded MAC addresses for ONOS 1.12 compat
Change-Id: Idaa1b95d8e8552f5ecb4ca2cb419b2f9c7944fbf
diff --git a/roles/create-lxd/tasks/main.yml b/roles/create-lxd/tasks/main.yml
index ce614ed..88c87a2 100644
--- a/roles/create-lxd/tasks/main.yml
+++ b/roles/create-lxd/tasks/main.yml
@@ -44,7 +44,7 @@
type: nic
parent: "{{ management_net_bridge }}"
nictype: bridged
- hwaddr: "{{ item.hwaddr | default( vtn_net_management_host_hwaddr_prefix ~ ( vtn_net_management_host_cidr | ipaddr(item.ipv4_last_octet) | ipaddr('address') | ip4_hex )) | hwaddr('unix') }}"
+ hwaddr: "{{ item.hwaddr | default( vtn_net_management_host_hwaddr_prefix ~ ( vtn_net_management_host_cidr | ipaddr(item.ipv4_last_octet) | ipaddr('address') | ip4_hex )) | hwaddr('linux') }}"
certs:
type: disk
path: /usr/local/share/ca-certificates/cord/
diff --git a/roles/dhcpd/templates/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcpd.conf.j2
index c54e578..14c4a64 100644
--- a/roles/dhcpd/templates/dhcpd.conf.j2
+++ b/roles/dhcpd/templates/dhcpd.conf.j2
@@ -50,7 +50,7 @@
option host-name "{{ node.name }}";
{% set host_ipaddr = (subnet.cidr | ipaddr(node.ipv4_last_octet) | ipaddr('address')) %}
fixed-address {{ host_ipaddr }};
- hardware ethernet {{ node.hwaddr | default(vtn_net_management_host_hwaddr_prefix ~ (host_ipaddr | ip4_hex)) | hwaddr('unix') }};
+ hardware ethernet {{ node.hwaddr | default(vtn_net_management_host_hwaddr_prefix ~ (host_ipaddr | ip4_hex)) | hwaddr('linux') }};
{% if node.pxe_filename is defined %}
filename "{{ node.pxe_filename }}";
next-server {{ subnet.tftp_server | default(subnet.cidr | ipaddr('1') | ipaddr('address')) }};
@@ -67,7 +67,7 @@
option host-name "{{ node.name }}";
{% set host_ipaddr = (subnet.cidr | ipaddr(node.ipv4_last_octet) | ipaddr('address')) %}
fixed-address {{ host_ipaddr }};
- hardware ethernet {{ node.hwaddr | default(vtn_net_management_host_hwaddr_prefix ~ (host_ipaddr | ip4_hex)) | hwaddr('unix') }};
+ hardware ethernet {{ node.hwaddr | default(vtn_net_management_host_hwaddr_prefix ~ (host_ipaddr | ip4_hex)) | hwaddr('linux') }};
{% if node.pxe_filename is defined %}
filename "{{ subnet.pxe_filename }}";
next-server {{ subnet.tftp_server | default(subnet.cidr | ipaddr('1') | ipaddr('address')) }};
diff --git a/roles/interface-config/templates/fabric.cfg.j2 b/roles/interface-config/templates/fabric.cfg.j2
index d4ae88b..7c51065 100644
--- a/roles/interface-config/templates/fabric.cfg.j2
+++ b/roles/interface-config/templates/fabric.cfg.j2
@@ -35,7 +35,7 @@
network {{ vtn_net_public_cidr | ipaddr('network') }}
netmask {{ vtn_net_public_cidr | ipaddr('netmask') }}
broadcast {{ vtn_net_public_cidr | ipaddr('broadcast') }}
- hwaddress ether {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_ip | ip4_hex )) | hwaddr('unix') }}
+ hwaddress ether {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_ip | ip4_hex )) | hwaddr('linux') }}
post-down ip link del fabricbridge
{% if use_addresspool_vsg %}
@@ -70,7 +70,7 @@
network {{ vtn_net_public_cidr | ipaddr('network') }}
netmask {{ vtn_net_public_cidr | ipaddr('netmask') }}
broadcast {{ vtn_net_public_cidr | ipaddr('broadcast') }}
- hwaddress ether {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_ip | ip4_hex )) | hwaddr('unix') }}
+ hwaddress ether {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_ip | ip4_hex )) | hwaddr('linux') }}
bond-miimon 100
bond-slaves none
bond-mode active-backup
diff --git a/roles/interface-config/templates/management.cfg.j2 b/roles/interface-config/templates/management.cfg.j2
index de8d942..d366660 100644
--- a/roles/interface-config/templates/management.cfg.j2
+++ b/roles/interface-config/templates/management.cfg.j2
@@ -11,7 +11,7 @@
network {{ vtn_net_management_host_cidr | ipaddr('network') }}
netmask {{ vtn_net_management_host_cidr | ipaddr('netmask') }}
broadcast {{ vtn_net_management_host_cidr | ipaddr('broadcast') }}
- hwaddress ether {{ ( vtn_net_management_host_hwaddr_prefix ~ ( mgmtbr_ip | ip4_hex )) | hwaddr('unix') }}
+ hwaddress ether {{ ( vtn_net_management_host_hwaddr_prefix ~ ( mgmtbr_ip | ip4_hex )) | hwaddr('linux') }}
dns-search {{ site_suffix }}
dns-nameservers {{ dns_servers | join(" ") }}
post-down ip link del mgmtbridge