[CORD-1650]
Finish changeover to new network configuration variables
Change-Id: I9d96c49e908245d009976ae101ca4b704e8dbab8
diff --git a/roles/interface-config/templates/management.cfg.j2 b/roles/interface-config/templates/management.cfg.j2
index d366660..bc669f9 100644
--- a/roles/interface-config/templates/management.cfg.j2
+++ b/roles/interface-config/templates/management.cfg.j2
@@ -2,19 +2,19 @@
{% for node in physical_node_list if node.name == ansible_hostname %}
# management bridge between physical and virtual interfaces for VTN
-{% set mgmtbr_ip = ( vtn_net_management_host_cidr | ipaddr(node.ipv4_last_octet) | ipaddr('address')) %}
-auto mgmtbridge
-iface mgmtbridge inet static
- pre-up ip link add mgmtbridge type bridge
+{% set mgmtbridge_ip = ( vtn_net_management_host_cidr | ipaddr(node.ipv4_last_octet) | ipaddr('address')) %}
+auto {{ management_net_bridge }}
+iface {{ management_net_bridge }} inet static
+ pre-up ip link add {{ management_net_bridge }} type bridge
bridge_ports mgmtbond vethmgmt0
- address {{ mgmtbr_ip }}
+ address {{ mgmtbridge_ip }}
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('linux') }}
+ hwaddress ether {{ ( vtn_net_management_host_hwaddr_prefix ~ ( mgmtbridge_ip | ip4_hex )) | hwaddr('linux') }}
dns-search {{ site_suffix }}
dns-nameservers {{ dns_servers | join(" ") }}
- post-down ip link del mgmtbridge
+ post-down ip link del {{ management_net_bridge }}
# management bond of physical interfaces
auto mgmtbond
@@ -47,7 +47,7 @@
pre-up ip link add vethmgmt0 type veth peer name vethmgmt1
pre-up ip link set vethmgmt0 up
pre-up ip link set vethmgmt1 up
- post-up ip link set dev vethmgmt0 master mgmtbridge
+ post-up ip link set dev vethmgmt0 master {{ management_net_bridge }}
pre-down ip link set dev vethmgmt0 nomaster
post-down ip link del vethmgmt0