calculate subnet/netmask from cidr

[yaml_builds.git] / hpgen10.yaml

diff --git a/hpgen10.yaml b/hpgen10.yaml
index a2aff22..0b336b8 100644 (file)
--- a/hpgen10.yaml
+++ b/hpgen10.yaml
@@ -16,6 +16,7 @@
 ##############################################################################
 
 site_name: hpgen10
+site_type: sriov
 ipmi_admin:
   username: Administrator
   password: Admin123
@@ -42,8 +43,6 @@ networks:
     vlan: 41
     interface: bond0.41
     cidr: 192.168.2.0/24
-    subnet: 192.168.2.0
-    netmask: 255.255.255.0
     routes:
        gateway: 192.168.2.200
     ranges:
@@ -53,9 +52,6 @@ networks:
       static:
         start: 192.168.2.1
         end: 192.168.2.83
-    dns:
-      domain: lab.akraino.org
-      servers: '192.168.2.85 8.8.8.8 8.8.4.4'
   storage:
     vlan: 42
     interface: bond0.42
@@ -81,10 +77,6 @@ networks:
       dhcp:
         start: 172.30.1.201
         end: 172.30.1.254
-    dns:
-      domain: lab.akraino.org
-      servers: '192.168.2.85 8.8.8.8 8.8.4.4'
-    inf: net4
   ksn:
     vlan: 44
     interface: bond0.44
@@ -115,8 +107,8 @@ dns:
     - 192.168.2.85
     - 8.8.8.8
     - 8.8.8.8
-  upstream_servers_joined: '192.168.2.85,8.8.8.8'
   ingress_domain: hpgen10.akraino.org
+  domain: lab.akraino.org
 sriovnets:
 - physical: sriovnet1
   interface: ens6f0
@@ -221,11 +213,10 @@ 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
-  http_boot_device: NIC.Slot.3-1-1
+#  bios_template: hpe_dl380_g10_uefi_base.json.template
+#  boot_template: hpe_dl380_g10_uefi_httpboot.json.template
+#  http_boot_device: NIC.Slot.3-1-1
 masters:
   - name : aknode31
     oob: 192.168.41.131
@@ -267,6 +258,9 @@ hardware:
   generation: '10'
   hw_version: '3'
   bios_version: '2.8'
+  bios_template: hpe_dl380_g10_uefi_base.json.template
+  boot_template: hpe_dl380_g10_uefi_httpboot.json.template
+  http_boot_device: NIC.Slot.3-1-1
 disks:
   - name : sdj
     labels:
@@ -283,7 +277,7 @@ disks:
         mountpoint: /var
   - name : sdk
     partitions:
-      - name: cephj
+      - name: ceph
         size: 300g
         mountpoint: /var/lib/ceph/journal
 disks_compute: