commit b61ca26f498d7a78bdbb377a3236e9eefbc6569c
author Zack Williams <zdw@opennetworking.org> Mon Jan 29 17:01:21 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Thu Feb 15 01:03:46 2018 +0000
tree 11dc662d1d57236d811360e0ef814462d73b69d5
parent 438f8d6781563f7173a79f585415292ec8a5636b

[CORD-1650]
Finish changeover to new network configuration variables

Change-Id: I9d96c49e908245d009976ae101ca4b704e8dbab8

roles/interface-config/defaults/main.yml

diff --git a/roles/interface-config/defaults/main.yml b/roles/interface-config/defaults/main.yml
index 6e2b541..b3bc9e2 100644
--- a/roles/interface-config/defaults/main.yml
+++ b/roles/interface-config/defaults/main.yml
@@ -31,7 +31,7 @@
 
 # management network configuration
 management_net_cidr: "10.1.0.0/24"
-management_net_bridge: "mgmtbr"
+management_net_bridge: "mgmtbridge"
 
 dns_servers:
   - "{{ management_net_cidr | ipaddr('1') | ipaddr('address') }}"

roles/interface-config/tasks/main.yml

diff --git a/roles/interface-config/tasks/main.yml b/roles/interface-config/tasks/main.yml
index f1d1253..c3d17c2 100644
--- a/roles/interface-config/tasks/main.yml
+++ b/roles/interface-config/tasks/main.yml
@@ -38,7 +38,7 @@
   when: management_net_config.changed
   command: "ifup {{ item }}"
   with_flattened:
-   - mgmtbridge
+   - "{{ management_net_bridge }}"
    - mgmtbond
    - "{{ management_net_interfaces }}"
    - vethmgmt0

roles/interface-config/templates/management.cfg.j2

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