X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=dellgen10-sriov-a13.yaml;fp=dellgen10.yaml;h=bfe58a8dbabcf17b0dba4e7ed30fc3b580bc4fbc;hb=fbb206730195c6f03ded7658d08f1ef708ebf88b;hp=35d7f27ec3c7b349b445ff64bed616a4d189cfc1;hpb=3395a537e26721ec33a80f66686ca932f9328722;p=yaml_builds.git

diff --git a/dellgen10.yaml b/dellgen10-sriov-a13.yaml
similarity index 66%
rename from dellgen10.yaml
rename to dellgen10-sriov-a13.yaml
index 35d7f27..bfe58a8 100644
--- a/dellgen10.yaml
+++ b/dellgen10-sriov-a13.yaml
@@ -16,7 +16,7 @@
 ##############################################################################
 
 site_name: dellgen10
-site_type: sriov
+site_type: sriov-a13
 ipmi_admin:
   username: root
   password: calvin
@@ -51,7 +51,7 @@ networks:
         end: 192.168.2.86
       static:
         start: 192.168.2.40
-        end: 192.168.2.45
+        end: 192.168.2.49
   storage:
     vlan: 42
     interface: bond0.42
@@ -84,19 +84,24 @@ networks:
     vlan: 44
     interface: bond0.44
     cidr: 172.29.1.0/24
+    gateway: 172.29.1.1
     local_asnumber: 65531
     ranges:
+      reserved:
+        start: 172.29.1.1
+        end:  172.29.1.10
       static:
-        start: 172.29.1.5
+        start: 172.29.1.11
         end: 172.29.1.254
     additional_cidrs:
       -  172.29.1.128/29
-    ingress_cidr: 172.29.1.129/32
+    ingress_vip: 172.29.1.129/32
     peers:
     - ip: 172.29.1.1
       scope: global
       asnumber: 65001
-    vrrp_ip: 172.29.1.1 # keep peers ip address in case of only peer.
+    # keep peers ip address in case of only peer.
+    vrrp_ip: 172.29.1.1
   neutron:
     vlan: 45
     interface: bond0.45
@@ -140,91 +145,38 @@ sriov:
       vlan_start: 2001
       vlan_end: 3000
       whitelists:
-      - "address": "0000:87:02.0"
-      - "address": "0000:87:02.1"
-      - "address": "0000:87:03.2"
-      - "address": "0000:87:03.3"
-      - "address": "0000:87:03.4"
-      - "address": "0000:87:03.5"
-      - "address": "0000:87:03.6"
-      - "address": "0000:87:03.7"
-      - "address": "0000:87:04.0"
-      - "address": "0000:87:04.1"
-      - "address": "0000:87:04.2"
-      - "address": "0000:87:04.3"
-      - "address": "0000:87:02.2"
-      - "address": "0000:87:04.4"
-      - "address": "0000:87:04.5"
-      - "address": "0000:87:04.6"
-      - "address": "0000:87:04.7"
-      - "address": "0000:87:05.0"
-      - "address": "0000:87:05.1"
-      - "address": "0000:87:05.2"
-      - "address": "0000:87:05.3"
-      - "address": "0000:87:05.4"
-      - "address": "0000:87:05.5"
-      - "address": "0000:87:02.3"
-      - "address": "0000:87:05.6"
-      - "address": "0000:87:05.7"
-      - "address": "0000:87:02.4"
-      - "address": "0000:87:02.5"
-      - "address": "0000:87:02.6"
-      - "address": "0000:87:02.7"
-      - "address": "0000:87:03.0"
-      - "address": "0000:87:03.1"
+      - "address": "0000:87:02.*"
+      - "address": "0000:87:03.*"
+      - "address": "0000:87:04.*"
+      - "address": "0000:87:05.*"
     - physical: sriovnet2
       interface: enp135s0f1
       vlan_start: 2001
       vlan_end: 3000
       whitelists:
-      - "address": "0000:87:0a.0"
-      - "address": "0000:87:0a.1"
-      - "address": "0000:87:0b.2"
-      - "address": "0000:87:0b.3"
-      - "address": "0000:87:0b.4"
-      - "address": "0000:87:0b.5"
-      - "address": "0000:87:0b.6"
-      - "address": "0000:87:0b.7"
-      - "address": "0000:87:0c.0"
-      - "address": "0000:87:0c.1"
-      - "address": "0000:87:0c.2"
-      - "address": "0000:87:0c.3"
-      - "address": "0000:87:0a.2"
-      - "address": "0000:87:0c.4"
-      - "address": "0000:87:0c.5"
-      - "address": "0000:87:0c.6"
-      - "address": "0000:87:0c.7"
-      - "address": "0000:87:0d.0"
-      - "address": "0000:87:0d.1"
-      - "address": "0000:87:0d.2"
-      - "address": "0000:87:0d.3"
-      - "address": "0000:87:0d.4"
-      - "address": "0000:87:0d.5"
-      - "address": "0000:87:0a.3"
-      - "address": "0000:87:0d.6"
-      - "address": "0000:87:0d.7"
-      - "address": "0000:87:0a.4"
-      - "address": "0000:87:0a.5"
-      - "address": "0000:87:0a.6"
-      - "address": "0000:87:0a.7"
-      - "address": "0000:87:0b.0"
-      - "address": "0000:87:0b.1"
+      - "address": "0000:87:0a.*"
+      - "address": "0000:87:0b.*"
+      - "address": "0000:87:0c.*"
+      - "address": "0000:87:0d.*"
 storage:
   osds:
     - data: /dev/sda
-      journal: /var/lib/ceph/journal/journal-sda
+      journal: /dev/sdh1
     - data: /dev/sdb
-      journal: /var/lib/ceph/journal/journal-sdb
+      journal: /dev/sdh2
     - data: /dev/sdc
-      journal: /var/lib/ceph/journal/journal-sdc
+      journal: /dev/sdh3
+  osd_count: 3
+  total_osd_count: 9
+tenant_storage:
+  osds:
     - data: /dev/sdd
-      journal: /var/lib/ceph/journal/journal-sdd
+      journal: /dev/sdh4
     - data: /dev/sde
-      journal: /var/lib/ceph/journal/journal-sde
+      journal: /dev/sdh5
     - data: /dev/sdf
-      journal: /var/lib/ceph/journal/journal-sdf
-  osd_count: 6
-  total_osd_count: 18
+      journal: /dev/sdh6
+  osd_count: 3
 genesis:
   name: aknode40
   oob: 192.168.41.40
@@ -242,6 +194,8 @@ masters:
     pxe: 172.30.2.41
     ksn: 172.29.1.41
     neutron: 10.0.102.41
+    oob_user: root
+    oob_password: calvin
   - name : aknode42
     oob: 192.168.41.42
     host: 192.168.2.42
@@ -249,6 +203,8 @@ masters:
     pxe: 172.30.2.42
     ksn: 172.29.1.42
     neutron: 10.0.102.42
+    oob_user: root
+    oob_password: calvin
 #workers:
 #  - name : aknode43
 #    oob: 192.168.41.43
@@ -273,46 +229,90 @@ hardware:
   generation: '10'
   hw_version: '3'
   bios_version: '2.8'
-  bios_template: dell_r740_g14_uefi_base.xml.template
+  bios_template:
   boot_template: dell_r740_g14_uefi_httpboot.xml.template
   http_boot_device: NIC.Slot.2-1-1
+  device_aliases:
+    ## network
+    - name: eno3
+      key: pxe_nic01
+      address: '0000:01:00.0'
+      dev_type: 'I350 Gigabit Network Connection'
+      bus_type: 'pci'
+    - name: enp94s0f0
+      key: data_nic01
+      address: '0000:5e:00.0'
+      dev_type: 'Ethernet 10G 2P X520 Adapter'
+      bus_type: 'pci'
+    - name: enp94s0f1
+      key: data_nic02
+      address: '0000:5e:00.1'
+      dev_type: 'Ethernet 10G 2P X520 Adapter'
+      bus_type: 'pci'
+    ## storage  - use "dmesg | grep -Pe 'sd \d:\d'" to find address of drives
+    - name: /dev/sdg
+      key: bootdisk
+      address: '0:2.0.0'
+      dev_type: 'PERC H730P'
+      bus_type: 'scsi'
+    - name: /dev/sdh
+      key: cephjournal1
+      address: '0:2.1.0'
+      dev_type: 'PERC H730P'
+      bus_type: 'scsi'
+    - name: /dev/sdi
+      key: cephjournal2
+      address: '0:2.2.0'
+      dev_type: 'PERC H730P'
+      bus_type: 'scsi'
+    - name: /dev/sdj
+      key: ephemeral
+      address: '0:2.3.0'
+      dev_type: 'PERC H730P'
+      bus_type: 'scsi'
+
 disks:
-  - name : sdg
+#  - name : sdg
+  - name : bootdisk
     labels:
       bootdrive: 'true'
     partitions:
       - name: root
-        size: 20g
+        size: 30g
+        bootable: true
         mountpoint: /
       - name: boot
         size: 1g
         mountpoint: /boot
+      - name: var_log
+        size: '100g'
+        mountpoint: /var/log
       - name: var
-        size: 100g
+        size: '>100g'
         mountpoint: /var
-  - name : sdh
-    partitions:
-      - name: ceph
-        size: 300g
-        mountpoint: /var/lib/ceph/journal
 disks_compute:
-  - name : sdg
+#  - name : sdg
+  - name : bootdisk
     labels:
       bootdrive: 'true'
     partitions:
       - name: root
-        size: 20g
+        size: 30g
+        bootable: true
         mountpoint: /
       - name: boot
         size: 1g
         mountpoint: /boot
+      - name: var_log
+        size: '100g'
+        mountpoint: /var/log
       - name: var
-        size: '>300g'
+        size: '>100g'
         mountpoint: /var
-  - name : sdh
+  - name : ephemeral
     partitions:
       - name: nova
-        size: '99%'
+        size: 99%
         mountpoint: /var/lib/nova
 genesis_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/n4mNLAj3XKG2fcm+8eVe0NUlNH0g8DA8KJ53rSLKccm8gm4UgLmGOJyBfUloQZMuOpU6a+hexN4ECCliqI7+KUmgJgsvLkJ3OUMNTEVu9tDX5mdXeffsufaqFkAdmbJ/9PMPiPQ3/UqbbtyEcqoZAwUWf4ggAWSp00SGE1Okg+skPSbDzPVHb4810eXZT1yoIg29HAenJNNrsVxvnMT2kw2OYmLfxgEUh1Ev4c5LnUog4GXBDHQtHAwaIoTu9s/q8VIvGav62RJVFn3U1D0jkiwDLSIFn8ezORQ4YkSidwdSrtqsqa2TJ0E5w/n5h5IVGO9neY8YlXrgynLd4Y+7 root@pocnjrsv132"
 kubernetes: