From: Your Name <you@example.com>
Date: Mon, 15 Oct 2018 15:23:33 +0000 (-0700)
Subject: intel-pod18: add fuel support
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F65213%2F4;p=pharos.git

intel-pod18: add fuel support

Adding support for fuel installation on intel-pod18

Change-Id: Ieaad34fd2c0aa96f9aa1f48f403c46cd890437eb
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
---

diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml
index 0e23c862..008cfa2d 100644
--- a/labs/intel/idf-pod18.yaml
+++ b/labs/intel/idf-pod18.yaml
@@ -8,43 +8,96 @@
 ---
 idf:
   version: 0.1
-  installer: ['joid']
+  installer: ['joid', 'fuel']
   net_config:
     # NOTE: Network names are likely to change after the PDF spec is updated
     oob:
       interface: 0
-      ip-range:
-      vlan:
+      ip-range: 10.10.180.10-10.10.180.15
+      vlan: native
       mask: 24
     admin:  # admin
       interface: 1
       vlan: native
       network: 10.10.181.0
       mask: 24
-      gateway: 10.10.181.2
       bridge: brAdm
     mgmt:  # data
       interface: 2
-      vlan:
-      network: 10.10.182.0
+      vlan: 184
+      network: 10.10.184.0
+      ip-range: 10.10.184.10-10.10.184.254
       mask: 24
     storage:  # storage
       interface: 3
-      vlan:
-      network: 10.10.182.0
+      vlan: native
+      network: 10.10.183.0
       mask: 24
     private:  # floating
-      interface:
-      vlan:
-      network: 10.10.180.0
+      interface: 2
+      vlan: native
+      network: 10.10.182.0
       mask: 24
       bridge: brExt
     public:  # public
-      interface:
+      interface: 3
       vlan: 1183
       network: 10.10.185.0
+      ip-range: 10.10.185.100-10.10.185.253
       mask: 24
       gateway: 10.10.185.1
       dns:
         - 8.8.8.8
         - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'brAdm'
+        mgmt: 'mgmt18_br0'
+        private: ~
+        public: 'brExt'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
+    network:
+      ntp_strata_host1: 1.pool.ntp.org
+      ntp_strata_host2: 0.pool.ntp.org
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'eno1'
+            - 'eno2'
+            - 'ens785f0'
+            - 'ens785f1'
+            - 'ens785f2'
+            - 'ens785f3'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:03:00.0'
+            - '0000:03:00.3'
+            - '0000:05:00.0'
+            - '0000:05:00.1'
+            - '0000:05:00.2'
+            - '0000:05:00.3'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces:
+            - 'eno1'
+            - 'enp3s0f3'
+            - 'ens785f0'
+            - 'ens785f1'
+            - 'ens785f2'
+            - 'ens785f3'
+          busaddr:
+            - '0000:03:00.0'
+            - '0000:03:00.3'
+            - '0000:05:00.0'
+            - '0000:05:00.1'
+            - '0000:05:00.2'
+            - '0000:05:00.3'
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
index 088ef358..73ab232d 100644
--- a/labs/intel/pod18.yaml
+++ b/labs/intel/pod18.yaml
@@ -51,9 +51,13 @@ jumphost:
       mac_address: "A4:BF:01:16:31:96"
       vlan: native
     - name: 'nic2'
-      address: 10.10.181.20
+      address: 10.10.182.20
       mac_address: "A4:BF:01:16:31:97"
       vlan: native
+    - name: 'nic3'
+      address: 10.10.181.20
+      mac_address: "3c:fd:fe:a4:9c:f1"
+      vlan: native
 nodes:
   - name: pod18-node1
     node: &nodeparas
@@ -92,7 +96,7 @@ nodes:
         features:
         address: 10.10.181.21
         mac_address: "A4:BF:01:14:40:17"
-        vlan: native
+        vlan: 184
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
@@ -136,7 +140,7 @@ nodes:
         features:
         address: 10.10.181.22
         mac_address: "A4:BF:01:16:31:1F"
-        vlan: native
+        vlan: 184
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
@@ -180,7 +184,7 @@ nodes:
         features:
         address: 10.10.181.23
         mac_address: "A4:BF:01:16:30:F7"
-        vlan: native
+        vlan: 184
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
@@ -224,7 +228,7 @@ nodes:
         features:
         address: 10.10.181.24
         mac_address: "A4:BF:01:14:72:0E"
-        vlan: native
+        vlan: 184
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
@@ -268,7 +272,7 @@ nodes:
         features:
         address: 10.10.181.25
         mac_address: "A4:BF:01:14:71:69"
-        vlan: native
+        vlan: 184
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'