calculate subnet/netmask from cidr

[yaml_builds.git] / tools / j2 / serverrc.j2

diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index cd18e01..d20c2ab 100644 (file)
--- a/tools/j2/serverrc.j2
+++ b/tools/j2/serverrc.j2
@@ -22,28 +22,16 @@
 # host name for server
 SRV_NAME={{yaml.genesis.name}}
 
-# server oem - Dell or HPE (case sensitive)
-SRV_OEM={{yaml.genesis.oem}}
-
 # out of band interface information for server (idrac/ilo/etc)
 SRV_OOB_IP={{yaml.genesis.oob}}
 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 %}
 
-# name of network interface used during build when ipxe.efi is booted and when os is booted
-# ipxe numbers ports from 0-n in pci bus order.
-# the netx value will depend on how many nics are in the server
-# and which pci device number is assigned to the slot
-SRV_IPXE_INF={{yaml.networks.pxe.inf}}
-
-# the build interface is the nic used by the Ubuntu installed to load the OS
-SRV_BLD_INF={{yaml.networks.slaves[0].name}}
-
 # the boot device is the device name on which the OS will be loaded
 SRV_BOOT_DEVICE={{yaml.disks[0].name}}
 SRV_CEPH_DEVICE={{yaml.disks[1].name}}
@@ -73,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
@@ -81,15 +70,16 @@ 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}}
-           {% else %}{{yaml.dns.server_domain}}
+           {% else %}{{yaml.dns.domain}}
            {% endif %}
 SRV_DNSSEARCH={% if 'dns' in yaml.networks.pxe and 'domain' in yaml.networks.pxe.dns %}{{yaml.networks.pxe.dns.domain}}
-              {% else %}{{yaml.dns.server_domain}}
+              {% else %}{{yaml.dns.domain}}
               {% endif %}
 SRV_NTP=ntp.ubuntu.org