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

diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index cd18e01..b9f768f 100644
--- a/tools/j2/serverrc.j2
+++ b/tools/j2/serverrc.j2
@@ -22,9 +22,6 @@
 # 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}}
@@ -35,15 +32,6 @@ SRV_OOB_PWD={{yaml.ipmi_admin.password}}
 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}}
@@ -86,10 +74,10 @@ SRV_NETMASK={{yaml.networks.host.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