summaryrefslogtreecommitdiffstats
path: root/labs/bii
diff options
context:
space:
mode:
Diffstat (limited to 'labs/bii')
-rw-r--r--labs/bii/idf-pod1.yaml33
-rw-r--r--labs/bii/pod1.yaml91
2 files changed, 66 insertions, 58 deletions
diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml
new file mode 100644
index 00000000..8c358a9c
--- /dev/null
+++ b/labs/bii/idf-pod1.yaml
@@ -0,0 +1,33 @@
+---
+### This is a BII POD1 Installer descriptor file ###
+
+idf:
+ version: 0.1
+ net_config:
+ admin:
+ interface: 0
+ vlan: 0
+ network: 10.20.0.0
+ mask: 24
+ gateway: 10.20.0.1
+ dns: 10.20.0.1
+ mgmt:
+ interface: 0
+ vlan: 102
+ network: 192.168.102.0
+ mask: 24
+ storage:
+ interface: 0
+ vlan: 101
+ network: 192.168.101.0
+ mask: 24
+ private:
+ interface: 0
+ vlan: 103
+ network: 192.168.103.0
+ mask: 24
+ public:
+ interface: 1
+ vlan: 0
+ network: 192.168.20.0
+ mask: 24
diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml
index 29d9a4e2..117721b6 100644
--- a/labs/bii/pod1.yaml
+++ b/labs/bii/pod1.yaml
@@ -1,42 +1,13 @@
### This is a BII POD1 descriptor file ###
---
details:
- pod owner: ylong@BII
+ pod_owner: ylong@BII
contact: ylong@biigroup.cn, zjtang@biigroup.cn
lab: BII Pharos LAB
location: BDA, Beijing, China
type: development
link: https://wiki.opnfv.org/display/pharos/BII
###################################################
-net_config:
- admin:
- interface: 0
- vlan: 0
- network: 10.20.0.0
- mask: 24
- gateway: 10.20.0.1
- dns: 10.20.0.1
- mgmt:
- interface: 0
- vlan: 102
- network: 192.168.102.0
- mask: 24
- storage:
- interface: 0
- vlan: 101
- network: 192.168.101.0
- mask: 24
- private:
- interface: 0
- vlan: 103
- network: 192.168.103.0
- mask: 24
- public:
- interface: 1
- vlan: 0
- network: 192.168.20.0
- mask: 24
-###################################################
jumphost:
name: fuel
node:
@@ -86,11 +57,12 @@ jumphost:
address: 192.168.20.200
mac_address: "44:A8:42:1A:68:78"
interfaces: # physical interface list
- - "44:a8:42:15:10:03"
- - "44:a8:42:15:10:04"
- fixed_ips:
- admin: 10.20.0.2
- public: 192.168.20.5
+ - mac_address: "44:a8:42:15:10:03"
+ address: 10.20.0.2
+ name: 'nic1'
+ - mac_address: "44:a8:42:15:10:04"
+ address: 192.168.20.5
+ name: 'nic2'
###################################################
nodes:
- name: compute1
@@ -103,8 +75,8 @@ nodes:
cpu_cflags: haswell # add values based on CFLAGS in GCC
cores: 8 # physical cores, not including hyper-threads
memory: 32G
- disks: &disk_A # disk list
- - name: 'disk1' # first disk
+ disks: &disks_A # disk list
+ - name: 'disk1' # first disk
disk_capacity: 128G # volume
disk_type: ssd # several disk types possible
disk_interface: sas # several interface types possible
@@ -134,9 +106,9 @@ nodes:
address: 192.168.20.201
mac_address: "44:A8:42:1A:70:BE"
interfaces: # physical interface list
- - "44:a8:42:14:ee:64"
- fixed_ips:
- admin: 10.20.0.4
+ - mac_address: "44:a8:42:14:ee:64"
+ address: 10.20.0.4
+ name: 'nic1'
########################################
- name: compute2
node: *nodeparas
@@ -146,9 +118,9 @@ nodes:
address: 192.168.20.202
mac_address: "44:A8:42:1A:76:26"
interfaces:
- - "44:a8:42:14:cb:31"
- fixed_ips:
- admin: 10.20.0.5
+ - mac_address: "44:a8:42:14:cb:31"
+ address: 10.20.0.5
+ name: 'nic1'
########################################
- name: controller1
node: *nodeparas
@@ -158,11 +130,12 @@ nodes:
address: 192.168.20.203
mac_address: "44:A8:42:1A:49:A5"
interfaces:
- - "44:a8:42:14:cd:0d"
- - "44:a8:42:14:cd:0e"
- fixed_ips:
- admin: 10.20.0.6
- public: 192.168.20.12
+ - mac_address: "44:a8:42:14:cd:0d"
+ address: 10.20.0.6
+ name: 'nic1'
+ - mac_address: "44:a8:42:14:cd:0e"
+ address: 192.168.20.12
+ name: 'nic2'
########################################
- name: controller2
node: *nodeparas
@@ -172,11 +145,12 @@ nodes:
address: 192.168.20.204
mac_address: "44:A8:42:1A:76:2C"
interfaces:
- - "44:a8:42:15:1b:e6"
- - "44:a8:42:15:1b:e7"
- fixed_ips:
- admin: 10.20.0.7
- public: 192.168.20.13
+ - mac_address: "44:a8:42:15:1b:e6"
+ address: 10.20.0.7
+ name: 'nic1'
+ - mac_address: "44:a8:42:15:1b:e7"
+ address: 192.168.20.13
+ name: 'nic2'
########################################
- name: controller3
node: *nodeparas
@@ -186,8 +160,9 @@ nodes:
address: 192.168.20.205
mac_address: "44:A8:42:13:D5:1B"
interfaces:
- - "44:a8:42:14:fc:1a"
- - "44:a8:42:14:fc:1b"
- fixed_ips:
- admin: 10.20.0.8
- public: 192.168.20.14
+ - mac_address: "44:a8:42:14:fc:1a"
+ address: 10.20.0.8
+ name: 'nic1'
+ - mac_address: "44:a8:42:14:fc:1b"
+ address: 192.168.20.14
+ name: 'nic2'