aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--installers/fuel/pod_config.yml.j2117
-rw-r--r--labs/arm/idf-pod5.yaml26
-rw-r--r--labs/arm/idf-pod6.yaml46
-rw-r--r--labs/arm/pod6.yaml280
-rw-r--r--labs/ericsson/idf-pod1.yaml34
-rw-r--r--labs/ericsson/pod1.yaml165
-rw-r--r--labs/lf/idf-pod2.yaml30
-rw-r--r--labs/zte/idf-pod1.yaml44
-rw-r--r--labs/zte/pod1.yaml171
9 files changed, 679 insertions, 234 deletions
diff --git a/installers/fuel/pod_config.yml.j2 b/installers/fuel/pod_config.yml.j2
deleted file mode 100644
index 5406d76..0000000
--- a/installers/fuel/pod_config.yml.j2
+++ /dev/null
@@ -1,117 +0,0 @@
-{%- if conf.net_config is defined -%}
- {%- set net_admin = conf['net_config']['admin']['network'] -%}
- {%- set net_mgmt = conf['net_config']['mgmt']['network'] -%}
- {%- set net_private = conf['net_config']['private']['network'] -%}
- {%- set net_public = conf['net_config']['public']['network'] -%}
- {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
- {%- set vlan_private = conf['net_config']['private']['vlan'] -%}
- {%- if conf.net_config.public.dns is defined -%}
- {%- set dns_public = conf['net_config']['public']['dns'] -%}
- {%- endif -%}
-{%- else -%}
- {%- set net_admin = '192.168.11.0' -%}
- {%- set net_mgmt = '172.16.10.0' -%}
- {%- set net_private = '10.1.0.0' -%}
- {%- set net_public = '172.30.10.0' -%}
- {%- set vlan_mgmt = '300' -%}
- {%- set vlan_private = '302' -%}
-{%- endif -%}
-
-{%- if dns_public is not defined -%}
- {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
-{%- endif -%}
-
----
-parameters:
- _param:
-
- opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
- opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
- opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
- opnfv_infra_compute_node01_address: {{ net_mgmt | ipaddr_index('141') }}
- opnfv_infra_compute_node02_address: {{ net_mgmt | ipaddr_index('142') }}
- opnfv_infra_compute_node03_address: {{ net_mgmt | ipaddr_index('143') }}
- opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
- opnfv_infra_kvm_node01_address: {{ net_mgmt | ipaddr_index('141') }}
- opnfv_infra_kvm_node02_address: {{ net_mgmt | ipaddr_index('142') }}
- opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
-
- opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
- opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}
- opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index('126') }}
- opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }}
- opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }}
- opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }}
- opnfv_openstack_proxy_address: {{ net_mgmt | ipaddr_index('80') }}
- opnfv_openstack_proxy_node01_address: {{ net_mgmt | ipaddr_index('81') }}
- opnfv_openstack_proxy_node02_address: {{ net_mgmt | ipaddr_index('82') }}
- opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
- opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
- opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
- opnfv_openstack_control_node03_address: {{ net_mgmt | ipaddr_index('13') }}
- opnfv_openstack_database_address: {{ net_mgmt | ipaddr_index('50') }}
- opnfv_openstack_database_node01_address: {{ net_mgmt | ipaddr_index('51') }}
- opnfv_openstack_database_node02_address: {{ net_mgmt | ipaddr_index('52') }}
- opnfv_openstack_database_node03_address: {{ net_mgmt | ipaddr_index('53') }}
- opnfv_openstack_message_queue_address: {{ net_mgmt | ipaddr_index('40') }}
- opnfv_openstack_message_queue_node01_address: {{ net_mgmt | ipaddr_index('41') }}
- opnfv_openstack_message_queue_node02_address: {{ net_mgmt | ipaddr_index('42') }}
- opnfv_openstack_message_queue_node03_address: {{ net_mgmt | ipaddr_index('43') }}
- opnfv_openstack_telemetry_address: {{ net_mgmt | ipaddr_index('75') }}
- opnfv_openstack_telemetry_node01_address: {{ net_mgmt | ipaddr_index('76') }}
- opnfv_openstack_telemetry_node02_address: {{ net_mgmt | ipaddr_index('77') }}
- opnfv_openstack_telemetry_node03_address: {{ net_mgmt | ipaddr_index('78') }}
- opnfv_openstack_compute_node01_single_address: {{ net_mgmt | ipaddr_index('101') }}
- opnfv_openstack_compute_node02_single_address: {{ net_mgmt | ipaddr_index('102') }}
- opnfv_openstack_compute_node03_single_address: {{ net_mgmt | ipaddr_index('103') }}
- opnfv_openstack_compute_node01_control_address: {{ net_mgmt | ipaddr_index('101') }}
- opnfv_openstack_compute_node02_control_address: {{ net_mgmt | ipaddr_index('102') }}
- opnfv_openstack_compute_node03_control_address: {{ net_mgmt | ipaddr_index('103') }}
- opnfv_openstack_compute_node01_tenant_address: {{ net_private | ipaddr_index('101') }}
- opnfv_openstack_compute_node02_tenant_address: {{ net_private | ipaddr_index('102') }}
- opnfv_openstack_compute_node03_tenant_address: {{ net_private | ipaddr_index('103') }}
- opnfv_openstack_compute_node01_external_address: {{ net_public | ipaddr_index('101') }}
- opnfv_openstack_compute_node02_external_address: {{ net_public | ipaddr_index('102') }}
-
- opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
-
- opnfv_name_servers: {{ dns_public }}
- opnfv_dns_server01: '{{ dns_public[0] }}'
-
- opnfv_net_mgmt_vlan: {{ vlan_mgmt }}
- opnfv_net_tenant_vlan: {{ vlan_private }}
-
- opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
- opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }}
- opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }}
- opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }}
- opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][1] }}'
-
- opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }}
- opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }}
- opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }}
- opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }}
- opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][1] }}'
-
- opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }}
- opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }}
- opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }}
- opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }}
- opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][1] }}'
-
- opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }}
- opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }}
- opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }}
- opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }}
- opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][1] }}'
-
- opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }}
- opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }}
- opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }}
- opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }}
- opnfv_maas_node05_interface_mac: '{{ conf['nodes'][4]['interfaces'][1] }}'
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index bf49c0d..52ea6ed 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
---
### ARM POD 5 installer descriptor file ###
@@ -10,3 +17,22 @@ idf:
mgmt: 'mgmt7_br0'
private: ''
public: 'public7_br0'
+ network:
+ 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
+ - 'eth0'
+ - 'eth1'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - 'e0700000.xgmac'
+ - 'e0900000.xgmac'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
new file mode 100644
index 0000000..db03686
--- /dev/null
+++ b/labs/arm/idf-pod6.yaml
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
+---
+### ARM POD 6 installer descriptor file ###
+
+idf:
+ version: 0.1
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'admin14_br0'
+ mgmt: 'mgmt14_br0'
+ private: ''
+ public: 'public14_br0'
+ network:
+ 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
+ - 'enP5p144s0'
+ - 'enP2p1s0f1'
+ - 'enP2p1s0f2'
+ - 'enP2p1s0f3'
+ - 'enP2p1s0f4'
+ - 'enP2p1s0f5'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0005:90:00.0'
+ - '0002:01:00.1'
+ - '0002:01:00.2'
+ - '0002:01:00.3'
+ - '0002:01:00.4'
+ - '0002:01:00.5'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
new file mode 100644
index 0000000..674d9c9
--- /dev/null
+++ b/labs/arm/pod6.yaml
@@ -0,0 +1,280 @@
+---
+### Enea ARM POD 6 descriptor file ###
+
+details:
+ pod_owner: ENEA AB
+ contact: dan.lilliehorn@enea.com
+ lab: ENEA lab
+ location: Stockholm, Sweden
+ type: production
+ link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+net_config:
+ oob:
+ ip-range: 10.0.1.54-10.0.1.58
+ vlan: native
+ admin:
+ interface: 0
+ vlan: native
+ network: 192.168.11.0
+ mask: 24
+ mgmt:
+ interface: 1
+ vlan: 2323
+ network: 172.16.10.0
+ mask: 24
+ storage:
+ interface: 1
+ vlan: 2324
+ network: 10.2.0.0
+ mask: 24
+ private:
+ interface: 1
+ vlan: 2325
+ network: 10.1.0.0
+ mask: 24
+ public:
+ interface: 1
+ vlan: native
+ network: 10.0.15.0
+ mask: 24
+ gateway: 10.0.15.254
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+##############################################################################
+jumphost:
+ name: jenkins-slave-arm-pod6
+ node:
+ type: baremetal
+ vendor: AppliedMicro
+ model: XGene 1
+ arch: aarch64
+ cpus: 1
+ cpu_cflags: fp asimd evtstrm
+ cores: 8
+ memory: 32G
+ disks:
+ ##/dev/sda
+ - name: disk1
+ disk_capacity: 120G
+ disk_type: ssd
+ disk_interface: sata
+ ##/dev/sdb
+ - name: disk2
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ ##/dev/sdc
+ - name: disk3
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ os: ubuntu-16.04
+ remote_params: &remote_params
+ type: ipmi
+ versions:
+ - 2.0
+ user: ADMIN
+ pass: ADMIN
+ remote_management:
+ <<: *remote_params
+ address: 0.0.0.0
+ mac_address: "00:00:00:00:00:00"
+ interfaces:
+ ##eth0
+ - mac_address: "00:01:73:02:36:d4"
+ speed: 1gb
+ features: ''
+ ##eth1
+ - mac_address: "00:01:73:02:36:d5"
+ speed: 1gb
+ features: ''
+ ##eth2
+ - mac_address: "00:01:73:02:36:d6"
+ speed: 1gb
+ features: ''
+ ##eth3
+ - mac_address: "00:01:73:02:36:d7"
+ speed: 10gb
+ features: ''
+ fixed_ips:
+ admin: 192.168.11.1
+ mgmt: 172.16.10.1
+ public: 10.0.15.9
+##############################################################################
+nodes:
+ - name: cn8890-24
+ node: &nodeparams
+ type: baremetal
+ vendor: Cavium
+ model: ThunderX
+ arch: aarch64
+ cpus: 1
+ cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+ cores: 48
+ memory: 62G
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 480G
+ disk_type: ssd
+ disk_interface: sata
+ remote_management:
+ <<: *remote_params
+ address: 10.0.1.54
+ mac_address: "1c:1b:0d:e8:fa:8b"
+ interfaces:
+ ##enP5p144s0
+ - mac_address: "68:05:ca:5a:c3:a7"
+ speed: 1gb
+ features: ''
+ ##enP2p1s0f1
+ - mac_address: "1c:1b:0d:e8:fa:83"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ ##enP2p1s0f2
+ - mac_address: "1c:1b:0d:e8:fa:84"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ ##enP2p1s0f3
+ - mac_address: "1c:1b:0d:e8:fa:85"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ ##enP2p1s0f4
+ - mac_address: "1c:1b:0d:e8:fa:86"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ ##enP2p1s0f5
+ - mac_address: "1c:1b:0d:e8:fa:87"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.2
+ mgmt: 172.16.10.142
+ public: 10.0.15.142
+ ############################################################################
+ - name: cn8890-25
+ node: *nodeparams
+ disk: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.1.55
+ mac_address: "1c:1b:0d:e8:fa:ad"
+ interfaces:
+ - mac_address: "68:05:ca:5a:c3:bc"
+ speed: 1gb
+ features: ''
+ - mac_address: "1c:1b:0d:e8:fb:a5"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:a6"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:a7"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:a8"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:a9"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.3
+ mgmt: 172.16.10.143
+ public: 10.0.15.143
+ ############################################################################
+ - name: cn8890-26
+ node: *nodeparams
+ disk: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.1.56
+ mac_address: "1c:1b:0d:e8:fa:6d"
+ interfaces:
+ - mac_address: "68:05:ca:61:b9:00"
+ speed: 1gb
+ features: ''
+ - mac_address: "1c:1b:0d:e8:fa:65"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fa:66"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fa:67"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fa:68"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fa:69"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.4
+ mgmt: 172.16.10.144
+ public: 10.0.15.144
+ ############################################################################
+ - name: cn8890-27
+ node: *nodeparams
+ disk: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.1.57
+ mac_address: "1c:1b:0d:e8:fb:21"
+ interfaces:
+ - mac_address: "68:05:ca:57:f7:16"
+ speed: 1gb
+ features: ''
+ - mac_address: "1c:1b:0d:e8:fb:19"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:1a"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:1b"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:1c"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:1d"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.5
+ mgmt: 172.16.10.145
+ public: 10.0.15.145
+ ############################################################################
+ - name: cn8890-28
+ node: *nodeparams
+ disk: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.1.58
+ mac_address: "1c:1b:0d:e8:fb:85"
+ interfaces:
+ - mac_address: "68:05:ca:61:97:5a"
+ speed: 1gb
+ features: ''
+ - mac_address: "1c:1b:0d:e8:fb:7d"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:7e"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:7f"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:80"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ - mac_address: "1c:1b:0d:e8:fb:81"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ fixed_ips:
+ admin: 192.168.11.6
+ mgmt: 172.16.10.146
+ public: 10.0.15.146
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 1c9f297..14f74d4 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2017 Ericsson AB, 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
+##############################################################################
---
### ERICSSON POD 1 installer descriptor file ###
@@ -10,3 +17,30 @@ idf:
mgmt: 'br-mgmt'
private: ''
public: 'br-external'
+ network:
+ 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
+ - 'ens1f0'
+ - 'ens1f1'
+ - 'ens2f0'
+ - 'ens2f1'
+ - 'eno1'
+ - 'eno2'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:05:00.0'
+ - '0000:05:00.1'
+ - '0000:21:00.0'
+ - '0000:21:00.1'
+ - '0000:04:00.0'
+ - '0000:04:00.1'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index 3caa477..16fc124 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2017 Ericsson AB, 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
+##############################################################################
---
### POD descriptor file ###
@@ -9,6 +16,44 @@ details:
type: production
link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1
##############################################################################
+net_config:
+ # NOTE: Network names are likely to change after the PDF spec is updated
+ # NOTE: Some networks (e.g. admin) are created by the installer
+ # NOTE: Network-to-interface mapping will be reworked after PDF update
+ oob:
+ interface: 0
+ ip-range: 172.16.1.16-172.16.1.21
+ vlan: native
+ admin:
+ interface: 4
+ vlan: native
+ network: 192.168.11.0 # Untagged, 'PXE/Admin' for MaaS (no IP on JP)
+ mask: 24
+ mgmt:
+ interface: 2
+ vlan: 81
+ network: 192.168.10.0
+ mask: 24
+ storage:
+ interface: 2
+ vlan: 82
+ network: 192.168.20.0
+ mask: 24
+ private:
+ interface: 3
+ vlan: 1000
+ network: 192.168.2.0
+ mask: 24
+ public:
+ interface: 2
+ vlan: 80
+ network: 100.64.200.0
+ mask: 24
+ gateway: 100.64.200.1
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+##############################################################################
jumphost:
name: CI-POD1-HOST
node: &nodeparams
@@ -41,28 +86,40 @@ jumphost:
interfaces:
- nic: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 100.64.200.5/24
mac_address: "38:ea:a7:8f:53:00"
vlan: 80
- nic: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:53:01"
vlan: native
- nic: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 172.16.0.250/16
mac_address: "38:ea:a7:8f:06:00"
vlan: native
- nic: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:06:01"
vlan: native
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "9c:b6:54:8a:05:70"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "9c:b6:54:8a:05:74"
+ vlan: native
##############################################################################
nodes:
- name: CI-ERICSSON-POD1-NODE1
@@ -75,24 +132,36 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:98"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:99"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:84"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:85"
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "14:58:d0:54:e7:88"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
############################################################################
- name: CI-ERICSSON-POD1-NODE2
node: *nodeparams
@@ -104,24 +173,36 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:7c"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:7d"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:6c"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6b:6d"
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "14:58:d0:54:6a:60"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
############################################################################
- name: CI-ERICSSON-POD1-NODE3
node: *nodeparams
@@ -133,24 +214,36 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6a:38"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6a:39"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6a:3c"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:17:6a:3d"
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "14:58:d0:54:7a:28"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
############################################################################
- name: CI-ERICSSON-POD1-NODE4
node: *nodeparams
@@ -162,24 +255,36 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:1f:d4"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:1f:d5"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:52:cc"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:52:cd"
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "9c:b6:54:8a:95:a0"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
############################################################################
- name: CI-ERICSSON-POD1-NODE5
node: *nodeparams
@@ -191,21 +296,33 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:07:50"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:07:51"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:12:48"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address:
mac_address: "38:ea:a7:8f:12:49"
+ - nic: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "9c:b6:54:8a:10:18"
+ vlan: native
+ - nic: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address:
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index 7932f88..4ee359f 100644
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
---
### LF POD 2 installer descriptor file ###
@@ -10,3 +17,26 @@ idf:
mgmt: 'br-ctl'
private: ''
public: ''
+ network:
+ 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
+ - 'enp6s0'
+ - 'enp7s0'
+ - 'enp8s0'
+ - 'enp9s0'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:06:00.0'
+ - '0000:07:00.0'
+ - '0000:08:00.0'
+ - '0000:09:00.0'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml
new file mode 100644
index 0000000..42e5dda
--- /dev/null
+++ b/labs/zte/idf-pod1.yaml
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2017 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 installer descriptor file ###
+
+idf:
+ version: 0.1
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'pxebr'
+ mgmt: 'br-mgmt'
+ private: ''
+ public: 'br-external'
+ network:
+ 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
+ - 'ens4f0'
+ - 'ens12f0'
+ - 'ens12f1'
+ - 'ens44f0'
+ - 'ens44f1'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:01:00.0'
+ - '0000:08:00.0'
+ - '0000:08:00.1'
+ - '0000:81:00.0'
+ - '0000:81:00.1'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 5720865..6bbf6c2 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -9,10 +9,46 @@ details:
location: Shanghai, China
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:
- type: baremetal
+ type: barem
vendor: ZTE
model: R5300
arch: x86_64
@@ -37,19 +73,23 @@ jumphost:
disk_interface: sas
disk_rotation: 10000
os: CentOS-7
- remote_params: &remoteparas
+ remote_params: &remote_params
type: ipmi
versions:
- 2.0
user: zteroot
pass: superuser
+ remote_management:
+ <<: *remote_params
+ address:
+ mac_address:
interfaces:
- - nic: 'nic1'
- mac_address: "74:4a:a4:00:91:b3"
- address:
- - 10.20.6.1
- - 172.60.0.238
- - 192.168.1.238
+ - 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
nodes:
- name: pod1-node1
node: &nodeparas
@@ -73,169 +113,114 @@ nodes:
disk_interface: sas
disk_rotation: 10000
remote_management:
- <<: *remoteparas
+ <<: *remote_params
address: 192.168.1.101
mac_address: "74:4a:a4:00:cf:d9"
interfaces:
- - name: 'nic1'
+ - mac_address: "74:4a:a4:00:cf:dc"
speed: 1gb
features: null
- mac_address: "74:4a:a4:00:cf:dc"
- address: 10.20.6.11/24
- vlan: 160
- - name: 'nic2'
+ - mac_address: "74:4a:a4:00:b0:e1"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b0:e1"
- vlan: 161
- - name: 'nic3'
+ - mac_address: "74:4a:a4:00:b0:e2"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b0:e2"
- vlan: 162
- - name: 'nic4'
+ - mac_address: "74:4a:a4:00:b0:dd"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b0:dd"
- vlan: 1120
- - name: 'nic5'
+ - mac_address: "74:4a:a4:00:b0:de"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b0:de"
- vlan: 163
- name: pod1-node2
node: *nodeparas
disks: *disks
remote_management:
- <<: *remoteparas
+ <<: *remote_params
address: 192.168.1.102
mac_address: "74:4a:a4:00:ce:cb"
interfaces:
- - name: 'nic1'
+ - mac_address: "74:4a:a4:00:ce:ce"
speed: 1gb
features: null
- mac_address: "74:4a:a4:00:ce:ce"
- address: 10.20.6.12/24
- vlan: 160
- - name: 'nic2'
+ - mac_address: "74:4a:a4:00:d6:ad"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:ad"
- vlan: 161
- - name: 'nic3'
+ - mac_address: "74:4a:a4:00:d6:ae"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:ae"
- vlan: 162
- - name: 'nic4'
+ - mac_address: "74:4a:a4:00:d6:a9"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:a9"
- vlan: 1120
- - name: 'nic5'
+ - mac_address: "74:4a:a4:00:d6:aa"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:aa"
- vlan: 163
- name: pod1-node3
node: *nodeparas
disks: *disks
remote_management:
- <<: *remoteparas
+ <<: *remote_params
address: 192.168.1.103
mac_address: "74:4a:a4:00:cf:55"
interfaces:
- - name: 'nic1'
+ - mac_address: "74:4a:a4:00:cf:58"
speed: 1gb
features: null
- mac_address: "74:4a:a4:00:cf:58"
- address: 10.20.6.13/24
- vlan: 160
- - name: 'nic2'
+ - mac_address: "74:4a:a4:00:d6:ab"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:ab"
- vlan: 161
- - name: 'nic3'
+ - mac_address: "74:4a:a4:00:d6:ac"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:ac"
- vlan: 162
- - name: 'nic4'
+ - mac_address: "74:4a:a4:00:d6:af"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:af"
- vlan: 1120
- - name: 'nic5'
+ - mac_address: "74:4a:a4:00:d6:b0"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:b0"
- vlan: 163
- name: pod1-node4
node: *nodeparas
disks: *disks
remote_management:
- <<: *remoteparas
+ <<: *remote_params
address: 192.168.1.104
mac_address: "74:4a:a4:00:49:81"
interfaces:
- - name: 'nic1'
+ - mac_address: "74:4a:a4:00:49:84"
speed: 1gb
features: null
- mac_address: "74:4a:a4:00:49:84"
- address: 10.20.6.14/24
- vlan: 160
- - name: 'nic2'
+ - mac_address: "74:4a:a4:00:b1:a5"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b1:a5"
- vlan: 161
- - name: 'nic3'
+ - mac_address: "74:4a:a4:00:b1:a6"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b1:a6"
- vlan: 162
- - name: 'nic4'
+ - mac_address: "74:4a:a4:00:b1:b1"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b1:b1"
- vlan: 1120
- - name: 'nic5'
+ - mac_address: "74:4a:a4:00:b1:b2"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:b1:b2"
- vlan: 163
- name: pod1-node5
node: *nodeparas
disks: *disks
remote_management:
- <<: *remoteparas
+ <<: *remote_params
address: 192.168.1.105
mac_address: "74:4a:a4:00:ce:bf"
interfaces:
- - name: 'nic1'
+ - mac_address: "74:4a:a4:00:ce:c2"
speed: 1gb
features: null
- mac_address: "74:4a:a4:00:ce:c2"
- address: 10.20.6.15/24
- vlan: 160
- - name: 'nic2'
+ - mac_address: "74:4a:a4:00:d6:8d"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:8d"
- vlan: 161
- - name: 'nic3'
+ - mac_address: "74:4a:a4:00:d6:8e"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:8e"
- vlan: 162
- - name: 'nic4'
+ - mac_address: "74:4a:a4:00:d6:9b"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:9b"
- vlan: 1120
- - name: 'nic5'
+ - mac_address: "74:4a:a4:00:d6:9c"
speed: 10gb
features: dpdk|sriov
- mac_address: "74:4a:a4:00:d6:9c"
- vlan: 163