Code Review / pharos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "[fuel] Add support to use public net netmask from IDF"
[pharos.git] / labs / zte / pod1.yaml
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 83a59af..1b4d1ad 100644 (file)
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 ZTE, 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
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 ### ZTE POD 1 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
@@ -10,41 +17,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
 ##############################################################################
-net_config:
-  # NOTE: Network names are likely to change after the PDF spec is updated
-  oob:
-    interface: 0
-    ip-range: 192.168.1.101-192.168.1.105
-    vlan: null
-  admin:
-    interface: 0
-    vlan: native
-    network: 10.20.6.0
-    mask: 24
-  mgmt:
-    interface: 1
-    vlan: 161
-    network: 192.168.61.0
-    mask: 24
-  storage:
-    interface: 2
-    vlan: 162
-    network: 192.168.62.0
-    mask: 24
-  private:
-    interface: 3
-    vlan: 1120
-    network: 192.168.63.0
-    mask: 24
-  public:
-    interface: 4
-    vlan: 163
-    network: 172.60.0.0
-    mask: 24
-    gateway: 172.60.0.1
-    dns:
-      - 172.10.0.1
-##############################################################################
 jumphost:
   name: pod1-jump
   node:
@@ -53,7 +25,7 @@ jumphost:
     model: R5300
     arch: x86_64
     cpus: 2
-    cpu_cflags: hasewell
+    cpu_cflags: haswell
     cores: 12
     memory: 128G
   disks:
@@ -77,19 +49,36 @@ jumphost:
     type: ipmi
     versions:
       - 2.0
-    user:
-    pass:
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAV6BaFHBOwnf4GkZaHcoBjUi97U+68ossDNM1
+      fRRvw+whiNZ/UMkEheasAW2/sP//W+B8cIMLrFpA6vqYpn5wzFSWOsnXRDOW
+      hz1746p600c9TjsGbpMPtbNGgi68t3nB8VQoW7e57bM+yWVvJzLSI2my8bEw
+      a6FNuICymRAeXeyZjXSJ7w71F1XA8stuDSXm4/kAvigNTmS4kdvm6NYSNSZ9
+      +DtNJjcVQtXBpzNIB8sf+y9yTt1d58ZaSBtCLBIRoG+vSpFzJjUyPOdv01rP
+      pMleQ7IJHrucl8p35/pQ2nUOErrSBwNLq+XMIusIRySW1gAbxFn/I+d1aYsK
+      Txv0nDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAq1Y9d1AWsRxLIGNXE
+      1zJGgBCXqWtf5xcL5n9/YtpHtmA0]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAhnPH8p1YJQDJ3wS/0+KZemgS4oTX2gNKMJsf
+      TDmJzQNAcGnuORSEoowdTGUq65QFlb3yUi5B7mHaer2mN/4v12rEKc7TYRfB
+      PBNzpudCwB1UtMJTDBjrKtpVv4iWclAKZmreV4VKCFAFWHeQEzQhBQGBoykk
+      UKRdNCKcuBhoNa5d9QEjgpTse5PtEgPZxPQsKFh4RDQJRpL+JUHw05Cs8rv0
+      PR6UAnvrbd/pcYnUZUkNZc9x7bfedG6274A88DQ6sGFAbLjH2YvnJrNbUvy5
+      Le7bUT5G1V1ymtVpxg30ECDaSX4zKMeFgcHdU+dPAqSHfCkD1wLI7Cn5o7j2
+      uZZORTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGF9iDD5dBZN8p2qbS
+      4IoqgBAYdFlBw90sTOBqrhoHmRbr]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:91:b3"
       speed: 1gb
-  fixed_ips:
-    admin: 10.20.6.1
-    mgmt: 192.168.61.238
-    public: 172.60.0.238
+      address: 10.20.6.1
+      name: 'nic1'
 nodes:
   - name: pod1-node1
     node: &nodeparas
@@ -98,7 +87,7 @@ nodes:
       model: E9000
       arch: x86_64
       cpus: 2
-      cpu_cflags: hasewell
+      cpu_cflags: haswell
       cores: 10
       memory: 128G
     disks: &disks
@@ -120,18 +109,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:dc"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b0:e1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b0:e2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b0:dd"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b0:de"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node2
     node: *nodeparas
     disks: *disks
@@ -143,18 +137,23 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:ce"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ad"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ae"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:a9"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:aa"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node3
     node: *nodeparas
     disks: *disks
@@ -166,18 +165,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:58"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ab"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ac"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:af"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:b0"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node4
     node: *nodeparas
     disks: *disks
@@ -189,18 +193,23 @@ nodes:
       - mac_address: "74:4a:a4:00:49:84"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b1:a5"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b1:a6"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b1:b1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b1:b2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node5
     node: *nodeparas
     disks: *disks
@@ -212,15 +221,20 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:c2"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:8d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:8e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:9b"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:9c"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
Distributed and federated NFV test capability