remove obsolete variables and update names

Change-Id: I685cc95cbdd0d1f1ed9b729d692ac915607cffe3
Signed-off-by: davidplunkett <dp7642@att.com>

diff --git a/dellgen10.yaml b/dellgen10.yaml
index befa3c9..8bdc6cb 100644 (file)
--- a/dellgen10.yaml
+++ b/dellgen10.yaml
@@ -81,7 +81,6 @@ networks:
       dhcp:
         start: 172.30.2.201
         end: 172.30.2.254
-    inf: net4
   ksn:
     vlan: 44
     interface: bond0.44
@@ -116,7 +115,7 @@ dns:
     - 8.8.8.8
     - 8.8.4.4
   ingress_domain: dellgen10.akraino.org
-  server_domain: lab.akraino.org
+  domain: lab.akraino.org
 sriovnets:
 - physical: sriovnet1
   interface: enp135s0f0
@@ -217,7 +216,6 @@ genesis:
   ksn: 172.29.1.40
   neutron: 10.0.102.40
   root_password: akraino,d
-  oem: Dell
 #  bios_template: dell_r740_g14_uefi_base.xml.template
 #  boot_template: dell_r740_g14_uefi_httpboot.xml.template
 #  http_boot_device: NIC.Slot.2-1-1

diff --git a/hpgen10.yaml b/hpgen10.yaml
index a26c1fd..363f67c 100644 (file)
--- a/hpgen10.yaml
+++ b/hpgen10.yaml
@@ -78,7 +78,6 @@ networks:
       dhcp:
         start: 172.30.1.201
         end: 172.30.1.254
-    inf: net4
   ksn:
     vlan: 44
     interface: bond0.44
@@ -110,7 +109,7 @@ dns:
     - 8.8.8.8
     - 8.8.8.8
   ingress_domain: hpgen10.akraino.org
-  server_domain: lab.akraino.org
+  domain: lab.akraino.org
 sriovnets:
 - physical: sriovnet1
   interface: ens6f0
@@ -215,7 +214,6 @@ genesis:
   ksn: 172.29.1.30
   neutron: 10.0.101.30
   root_password: akraino,d
-  oem: HPE
   mac_address: 3c:fd:fe:aa:90:b0
 #  bios_template: hpe_dl380_g10_uefi_base.json.template
 #  boot_template: hpe_dl380_g10_uefi_httpboot.json.template
@@ -280,7 +278,7 @@ disks:
         mountpoint: /var
   - name : sdk
     partitions:
-      - name: cephj
+      - name: ceph
         size: 300g
         mountpoint: /var/lib/ceph/journal
 disks_compute:

diff --git a/scripts/update_bios_settings.py b/scripts/update_bios_settings.py
index 7fac2e7..1412dfc 100644 (file)
--- a/scripts/update_bios_settings.py
+++ b/scripts/update_bios_settings.py
@@ -72,7 +72,6 @@ defaults = dict( siteyaml["ipmi_admin"].items() + siteyaml["hardware"].items() )
 # add keys for backward compatibility
 defaults = dict( [('oob_user',siteyaml['ipmi_admin']['username'])]       + defaults.items())
 defaults = dict( [('oob_password',siteyaml['ipmi_admin']['password'])]   + defaults.items())
-defaults = dict( [('oem',siteyaml['hardware']['vendor'])]                + defaults.items())
 
 print 'Using defaults:'
 for line in yaml.dump(defaults,default_flow_style=False).split('\n'):

diff --git a/templates/networks/physical/rack.j2 b/templates/networks/physical/rack.j2
index f2a24a2..1a43fbd 100644 (file)
--- a/templates/networks/physical/rack.j2
+++ b/templates/networks/physical/rack.j2
@@ -101,7 +101,7 @@ data:
     end: {{yaml.networks.pxe.ranges.dhcp.end}}
   dns:
     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 %}
     servers: '{% if 'dns' in yaml.networks.pxe %}{{yaml.networks.pxe.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}'
 ...
@@ -161,7 +161,7 @@ data:
     end: {{yaml.networks.host.ranges.static.end}}
   dns:
     domain: {% if 'dns' in yaml.networks.host and 'domain' in yaml.networks.host.dns %}{{yaml.networks.host.dns.domain}}
-            {% else %}{{yaml.dns.server_domain}}
+            {% else %}{{yaml.dns.domain}}
             {% endif %}
     servers: '{% if 'dns' in yaml.networks.host %}{{yaml.networks.host.dns.servers}}{% else %}{{yaml.dns.upstream_servers|join(' ')}}{% endif %}'
 ...

diff --git a/tools/j2/serverrc.j2 b/tools/j2/serverrc.j2
index cd18e01..b9f768f 100644 (file)
--- 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