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

diff --git a/dellgen10-sriov-a13.yaml b/dellgen10-sriov-a13.yaml
index bfe58a8..76afca2 100644
--- a/dellgen10-sriov-a13.yaml
+++ b/dellgen10-sriov-a13.yaml
@@ -43,6 +43,8 @@ networks:
     vlan: 41
     interface: bond0.41
     cidr: 192.168.2.0/24
+    ingress_vip: 192.168.2.49
+    maas_vip: 192.168.2.48
     routes:
        gateway: 192.168.2.200
     ranges:
@@ -96,10 +98,10 @@ networks:
     additional_cidrs:
       -  172.29.1.128/29
     ingress_vip: 172.29.1.129/32
-    peers:
-    - ip: 172.29.1.1
-      scope: global
-      asnumber: 65001
+#    peers:
+#    - ip: 172.29.1.1
+#      scope: global
+#      asnumber: 65001
     # keep peers ip address in case of only peer.
     vrrp_ip: 172.29.1.1
   neutron:
@@ -116,10 +118,9 @@ networks:
 dns:
   upstream_servers:
     - 192.168.2.85
-    - 8.8.8.8
-    - 8.8.4.4
-  ingress_domain: dellgen10.akraino.org
-  domain: lab.akraino.org
+    - 192.168.2.85
+  ingress_domain: dellgen10.lab.akraino.org
+  domain: dellgen10.lab.akraino.org
 gpu:
   alias:
     - name: "P4"
@@ -136,7 +137,7 @@ gpu:
       vendor_id: "10de"
 sriov:
   alias:
-    - name: "numa0"
+    - name: "sriov0"
       product_id: "158b"
       vendor_id: "8086"
   nets:
@@ -194,8 +195,6 @@ 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
@@ -203,8 +202,13 @@ masters:
     pxe: 172.30.2.42
     ksn: 172.29.1.42
     neutron: 10.0.102.42
-    oob_user: root
-    oob_password: calvin
+  - name : aknode43
+    oob: 192.168.41.43
+    host: 192.168.2.43
+    storage: 172.31.2.43
+    pxe: 172.30.2.43
+    ksn: 172.29.1.43
+    neutron: 10.0.102.43
 #workers:
 #  - name : aknode43
 #    oob: 192.168.41.43
@@ -214,22 +218,23 @@ masters:
 #    ksn: 172.29.1.43
 #    neutron: 10.0.102.43
 platform:
-  vcpu_pin_set: "4-21,26-43,48-65,72-87"
+#  vcpu_pin_set: "6-21,28-43,50-65,74-87"
   kernel_params:
+#    kernel_package: 'linux-image-4.15.0-66-generic'
     hugepagesz: '1G'
     hugepages: 32
 #    default_hugepagesz: '1G'
-    transparent_hugepage: 'never'
+#    transparent_hugepage: 'never'
     iommu: 'pt'
     intel_iommu: 'on'
-    amd_iommu: 'on'
+#    amd_iommu: 'on'
 #    console: 'ttyS1,115200n8'
 hardware:
   vendor: DELL
   generation: '10'
   hw_version: '3'
   bios_version: '2.8'
-  bios_template:
+  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
   device_aliases:
@@ -249,6 +254,16 @@ hardware:
       address: '0000:5e:00.1'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
+    - name: enp135s0f0
+      key: sriov_nic01
+      address: '0000:87:00.0'
+      dev_type: 'Ethernet 10G 2P X520 Adapter'
+      bus_type: 'pci'
+    - name: enp135s0f1
+      key: sriov_nic02
+      address: '0000:87: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
@@ -260,17 +275,16 @@ hardware:
       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'
-
+#    - 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 : bootdisk
@@ -284,11 +298,8 @@ disks:
       - name: boot
         size: 1g
         mountpoint: /boot
-      - name: var_log
-        size: '100g'
-        mountpoint: /var/log
       - name: var
-        size: '>100g'
+        size: '300g'
         mountpoint: /var
 disks_compute:
 #  - name : sdg
@@ -314,13 +325,12 @@ disks_compute:
       - name: nova
         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"
+genesis_ssh_public_key: 
 kubernetes:
   api_service_ip: 10.96.0.1
   etcd_service_ip: 10.96.0.2
   pod_cidr: 10.98.0.0/16
-  service_cidr: 10.96.0.0/15
+  service_cidr: 10.96.0.0/16
 regional_server:
   ip: 135.16.101.85
 ...
-