X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fj2%2Fserverrc.j2;h=d20c2ab2d37635e5b1fbf3d9f2170f2990018270;hb=0a2885e1506c60df0e39d1681657661bacd39670;hp=b9f768f70df421044d111fbec16b87fa64fca42f;hpb=a87fe956a57bc2294926cdb1020ab74676f5739d;p=yaml_builds.git

diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index b9f768f..d20c2ab 100644
--- a/tools/j2/serverrc.j2
+++ b/tools/j2/serverrc.j2
@@ -28,7 +28,7 @@ SRV_OOB_USR={{yaml.ipmi_admin.username}}
 SRV_OOB_PWD={{yaml.ipmi_admin.password}}
 
 # mac address of server to be used during the build - not required for Dell servers
-{% if 'genesis.mac_address' in yaml %}
+{% if 'mac_address' in yaml.genesis %}
 SRV_MAC={{yaml.genesis.mac_address}}
 {% endif %}
 
@@ -61,6 +61,7 @@ SRV_STORAGE_VLAN={{yaml.networks.storage.vlan}}
 SRV_CALICO_VLAN={{yaml.networks.ksn.vlan}}
 SRV_NEUTRON_VLAN={{yaml.networks.neutron.vlan}}
 SRV_PXE_INF={{yaml.networks.pxe.interface}}
+SRV_VXLAN_INF={{yaml.networks.vxlan.interface}}
 
 # basic network information for dhcp config and final server network settings
 SRV_MTU=9000
@@ -69,8 +70,9 @@ SRV_STORAGE_IP={{yaml.genesis.storage}}
 SRV_CALICO_IP={{yaml.genesis.ksn}}
 SRV_NEUTRON_IP={{yaml.genesis.neutron}}
 SRV_PXE_IP={{yaml.genesis.pxe}}
-SRV_SUBNET={{yaml.networks.host.subnet}}
-SRV_NETMASK={{yaml.networks.host.netmask}}
+SRV_VXLAN_IP={{yaml.genesis.vxlan}}
+SRV_SUBNET={{yaml.networks.host.cidr | cidr_subnet}}
+SRV_NETMASK={{yaml.networks.host.cidr | cidr_netmask}}
 SRV_GATEWAY={{yaml.networks.host.routes.gateway}}
 SRV_DNS="{% if 'dns' in yaml.networks.host %}{{yaml.networks.host.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}"
 SRV_DOMAIN={% if 'dns' in yaml.networks.pxe and 'domain' in yaml.networks.pxe.dns %}{{yaml.networks.pxe.dns.domain}}