Change the deployment mode from 'nonha' to 'noha'

[joid.git] / labconfig / orange / pod2 / labconfig.yaml

diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml
index 29d84d1..e9025ed 100644 (file)
--- a/labconfig/orange/pod2/labconfig.yaml
+++ b/labconfig/orange/pod2/labconfig.yaml
@@ -1,95 +1,156 @@
-labconfig:
-    lab_location: orangepod1
-    bridges:
-        - type: admin
-          bridge: brAdm
-          cidr: 192.168.2.0/24
-          gateway: 192.168.2.1
-        - type: data
-          bridge: brData
-          cidr: 192.168.12.0/24
-          gateway:
-        - type: storage
-          bridge: brStorage
-          cidr: 192.168.22.0/24
-          gateway:
-    labsettings:
-        upstream_dns: 192.168.2.1
+lab:
+  location: orange
+  racks:
+  - rack: pod2
     nodes:
-        - type: compute
-          architecture: x86_64
-          pxe_mac_address:
-              - "38:63:bb:3f:bc:c8"
-          power:
-              type: ipmi
-              address: 192.168.2.11
-              user: Administrator
-              pass: pod2Admin
-        - type: compute
-          architecture: x86_64
-          pxe_mac_address:
-              - "38:63:bb:44:34:84"
-          power:
-              type: ipmi
-              address: 192.168.2.12
-              user: Administrator
-              pass: po2Admin
-        - type: compute
-          architecture: x86_64
-          pxe_mac_address:
-              - "38:63:bb:3f:1d:8c"
-          power:
-              type: ipmi
-              address: 192.168.2.13
-              user: Administrator
-              pass: pod2Admin
-        - type: compute
-          architecture: x86_64
-          pxe_mac_address:
-              - "38:63:bb:3f:2d:a8"
-          power:
-              type: ipmi
-              address: 192.168.2.14
-              user: Administrator
-              pass: pod2Admin
-        - type: control
-          architecture: x86_64
-          pxe_mac_address:
-              - "94:57:a5:52:c9:48"
-          power:
-              type: ipmi
-              address: 192.168.2.15
-              user: Administrator
-              pass: pod2Admin
-        - type: control
-          architecture: x86_64
-          pxe_mac_address:
-              - "94:57:a5:52:63:b0"
-          power:
-              type: ipmi
-              address: 192.168.2.16
-              user: Administrator
-              pass: pod2Admin
-        - type: control
-          architecture: x86_64
-          pxe_mac_address:
-              - "94:57:a5:52:f1:80"
-          power:
-              type: ipmi
-              address: 192.168.2.17
-              user: Administrator
-              pass: pod2Admin
-
+    - name: rack-2-m1
+      architecture: x86_64
+      roles: [compute]
+      nics:
+      - ifname: eno1
+        spaces: [admin]
+        mac: ["1c:98:ec:11:ad:08"]
+      - ifname: eno2.2056
+        rename: eno99.2056
+        spaces: [public]
+        mac: ["1c:98:ec:11:ad:09"]
+      - ifname: eno2
+        rename: eno99
+        spaces: [floating]
+        mac: ["1c:98:ec:11:ad:09"]
+      - ifname: eno3
+        spaces: [data]
+        mac: ["1c:98:ec:11:ad:0a"]
+      power:
+        type: ipmi
+        address: 10.0.0.22
+        user: Administrator
+        pass: opnfv2017
+    - name: rack-2-m2
+      architecture: x86_64
+      roles: [compute]
+      nics:
+      - ifname: eno1
+        spaces: [admin]
+        mac: ["1c:98:ec:11:c2:c4"]
+      - ifname: eno2.2056
+        rename: eno99.2056
+        spaces: [public]
+        mac: ["1c:98:ec:11:c2:c5"]
+      - ifname: eno2
+        rename: eno99
+        spaces: [floating]
+        mac: ["1c:98:ec:11:c2:c5"]
+      - ifname: eno3
+        spaces: [data]
+        mac: ["1c:98:ec:11:c2:c6"]
+      power:
+        type: ipmi
+        address: 10.0.0.23
+        user: Administrator
+        pass: opnfv2017
+    - name: rack-2-m3
+      architecture: x86_64
+      roles: [compute]
+      nics:
+      - ifname: eno1
+        spaces: [admin]
+        mac: ["1c:98:ec:11:9d:c4"]
+      - ifname: eno2.2056
+        rename: eno99.2056
+        spaces: [public]
+        mac: ["1c:98:ec:11:9c:c5"]
+      - ifname: eno2
+        rename: eno99
+        spaces: [floating]
+        mac: ["1c:98:ec:11:9c:c5"]
+      - ifname: eno3
+        spaces: [data]
+        mac: ["1c:98:ec:11:9c:c6"]
+      power:
+        type: ipmi
+        address: 10.0.0.24
+        user: Administrator
+        pass: opnfv2017
+    - name: rack-2-m4
+      architecture: x86_64
+      roles: [compute]
+      nics:
+      - ifname: eno1
+        spaces: [admin]
+        mac: ["1c:98:ec:1c:5d:88"]
+      - ifname: ens3f0.2056
+        rename: eno99.2056
+        spaces: [public]
+        mac: ["a0:36:9f:1f:67:1c"]
+      - ifname: ens3f0
+        rename: eno99
+        spaces: [floating]
+        mac: ["a0:36:9f:1f:67:1c"]
+      - ifname: ens3f1
+        spaces: [data]
+        mac: ["a0:36:9f:1f:67:1e"]
+      power:
+        type: ipmi
+        address: 10.0.0.29
+        user: Administrator
+        pass: opnfv2017
+    - name: rack-2-m5
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: eno1
+        spaces: [admin]
+        mac: ["1c:98:ec:1d:84:7c"]
+      - ifname: ens3f0.2056
+        rename: eno99.2056
+        spaces: [public]
+        mac: ["a0:36:9f:1f:66:a4"]
+      - ifname: ens3f0
+        rename: eno99
+        spaces: [floating]
+        mac: ["a0:36:9f:1f:66:a4"]
+      - ifname: ens3f1
+        spaces: [data]
+        mac: ["a0:36:9f:1f:66:a6"]
+      power:
+        type: ipmi
+        address: 10.0.0.30
+        user: Administrator
+        pass: opnfv2017
+    floating-ip-range: 161.105.231.4,161.105.231.62,161.105.231.1,161.105.231.0/26
+    ext-port: "eno99"
+    dns: 10.2.0.1
+    osdomainname:
 opnfv:
     release: c
-    distro: trusty
-    type: nonha
-    openstack: liberty
+    distro: xenial
+    type: noha
+    openstack: newton
     sdncontroller:
-        - type: nosdn
+    - type: nosdn
     storage:
-        - type: ceph
-          disk: /srv/osd
-    floating-ip-range:
+    - type: ceph
+      disk: /dev/sdb /deb/sdc
     feature: odl_l2
-    ext-port: eth5
+    spaces:
+    - type: admin
+      bridge: brAdm
+      cidr: 10.2.0.0/24
+      gateway: 10.2.0.1
+      vlan:
+    - type: data
+      bridge: brData
+      cidr: 10.2.3.0/24
+      gateway:
+      vlan:
+    - type: public
+      bridge: brApi
+      cidr: 10.2.1.0/24
+      gateway: 10.2.1.1
+      vlan: 2056
+    - type: floating
+      bridge: brFloating
+      cidr:
+      gateway:
+      vlan: