[PDF] pod1: Refresh PDF, IDF examples

Sync latest changes from pharos git repo for our sample PDF/IDF:
- move net_config from PDF to IDF;
- minor cleanup;

JIRA: FUEL-322

Change-Id: If6865ac61a4942a1dd5daf7081fd8faa67e0e7bf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9a22e9e..cf166ba 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -284,6 +284,7 @@ BASE_CONFIG_IDF="${BASE_CONFIG_URI}/labs/${TARGET_LAB}/idf-${TARGET_POD}.yaml"
 LOCAL_PDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_PDF}")"
 LOCAL_IDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_IDF}")"
 LOCAL_PDF_RECLASS="${STORAGE_DIR}/pod_config.yml"
+rm -f "${LOCAL_PDF_RECLASS}"
 if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then
     if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
         notify "[ERROR] Could not retrieve PDF (Pod Descriptor File)!\n" 1>&2

diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml
index 4ee359f..d8001e2 100644 (file)
--- a/mcp/config/labs/local/idf-pod1.yaml
+++ b/mcp/config/labs/local/idf-pod1.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -10,13 +10,48 @@
 
 idf:
   version: 0.1
+  net_config:
+    # NOTE: Network names are likely to change after the PDF spec is updated
+    oob:
+      interface: 0
+      ip-range: 172.30.8.65-172.30.8.75
+      vlan: 410
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0  # Untagged, 'PXE/Admin' on wiki, different IP
+      mask: 24
+    mgmt:
+      interface: 0
+      vlan: 300
+      network: 10.167.4.0    # Tagged, 'vlan 300' on wiki
+      mask: 24
+    storage:
+      interface: 3
+      vlan: 301
+      network: 10.2.0.0      # Tagged, not the same with 'storage' on wiki
+      mask: 24
+    private:
+      interface: 1
+      vlan: 1000
+      network: 10.1.0.0      # Tagged, not the same with 'private' on wiki
+      mask: 24
+    public:
+      interface: 2
+      vlan: native
+      network: 172.30.10.0   # Untagged, 'public' on wiki
+      mask: 24
+      gateway: 172.30.10.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
   fuel:
     jumphost:
       bridges:
         admin: 'pxebr'
         mgmt: 'br-ctl'
-        private: ''
-        public: ''
+        private: ~
+        public: ~
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF

diff --git a/mcp/config/labs/local/pod1.yaml b/mcp/config/labs/local/pod1.yaml
index cf60dcf..219b2a6 100644 (file)
--- a/mcp/config/labs/local/pod1.yaml
+++ b/mcp/config/labs/local/pod1.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
 ---
 ### LF POD 2 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Trevor Bramwell
   contact: tbramwell@linuxfoundation.org
@@ -16,42 +17,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/LF+POD+2
 ##############################################################################
-net_config:
-  # NOTE: Network names are likely to change after the PDF spec is updated
-  oob:
-    interface: 0
-    ip-range: 172.30.8.65-172.30.8.75
-    vlan: 410
-  admin:
-    interface: 0
-    vlan: native
-    network: 192.168.11.0  # Untagged, 'PXE/Admin' on wiki, different IP
-    mask: 24
-  mgmt:
-    interface: 0
-    vlan: 300
-    network: 10.167.4.0    # Tagged, 'vlan 300' on wiki
-    mask: 24
-  storage:
-    interface: 3
-    vlan: 301
-    network: 10.2.0.0      # Tagged, not the same with 'storage' on wiki
-    mask: 24
-  private:
-    interface: 1
-    vlan: 1000
-    network: 10.1.0.0      # Tagged, not the same with 'private' on wiki
-    mask: 24
-  public:
-    interface: 2
-    vlan: native
-    network: 172.30.10.0   # Untagged, 'public' on wiki
-    mask: 24
-    gateway: 172.30.10.1
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-##############################################################################
 jumphost:
   name: pod2-jump
   node:
@@ -68,7 +33,7 @@ jumphost:
       disk_capacity: 2400G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation:
+      disk_rotation: 0
   os: centos-7
   remote_params: &remote_params
     type: ipmi
@@ -84,19 +49,20 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1a"
       speed: 40gb
       features: 'dpdk|sriov'
+      address: 192.168.11.1
+      name: 'nic1'
     - mac_address: "00:25:b5:a0:00:1b"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic2'
     - mac_address: "00:25:b5:a0:00:1c"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic3'
     - mac_address: "00:25:b5:a0:00:1d"
       speed: 40gb
       features: 'dpdk|sriov'
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 10.167.4.1
-    public: 172.30.10.72
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: pod2-node1
@@ -118,19 +84,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:2a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:2b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:2c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:2d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 10.167.4.2
-      public: 172.30.10.2
+        name: 'nic4'
   ############################################################################
   - name: pod2-node2
     node: *nodeparams
@@ -143,19 +109,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:3a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:3b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:3c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:3d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 10.167.4.3
-      public: 172.30.10.3
+        name: 'nic4'
   ############################################################################
   - name: pod2-node3
     node: *nodeparams
@@ -168,19 +134,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:4a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:4b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:4c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:4d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 10.167.4.4
-      public: 172.30.10.4
+        name: 'nic4'
   ############################################################################
   - name: pod2-node4
     node: *nodeparams
@@ -193,19 +159,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:5a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:5b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:5c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:5d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 10.167.4.5
-      public: 172.30.10.5
+        name: 'nic4'
   ############################################################################
   - name: pod2-node5
     node: *nodeparams
@@ -218,16 +184,16 @@ nodes:
       - mac_address: "00:25:b5:a0:00:6a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:6b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:6c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:6d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 10.167.4.6
-      public: 172.30.10.6
+        name: 'nic4'