summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragardner <agardner@linuxfoundation.org>2018-03-28 16:06:23 -0400
committerAric Gardner <agardner@linuxfoundation.org>2018-04-12 21:22:42 +0000
commita3c0456cc14a75e96808505e670d0cab37b30abc (patch)
tree2e06dfbea678b69276a2c86885f86bdca9ae774b
parent7f5c9b1933fc5302578a8f03c3f55795812820b4 (diff)
JOID PDF-IDF support for intel-pod18
More info in gerrit comments. Remove joid from all other idfs other than intel/pod18 add installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] where missing Change-Id: I2afc415599070e210736c5fc304f7cb150f05029 Signed-off-by: agardner <agardner@linuxfoundation.org>
-rw-r--r--config/installers/joid/pod_config.yaml.j2250
-rw-r--r--labs/arm/idf-pod6.yaml1
-rw-r--r--labs/bii/idf-pod1.yaml2
-rw-r--r--labs/ericsson/idf-pod1.yaml1
-rw-r--r--labs/ericsson/idf-pod2.yaml2
-rw-r--r--labs/huawei/idf-pod1.yaml2
-rw-r--r--labs/intel/idf-pod18.yaml41
-rw-r--r--labs/intel/pod18.yaml90
-rw-r--r--labs/lf/idf-pod2.yaml1
-rw-r--r--labs/lf/idf-pod4.yaml1
-rw-r--r--labs/lf/idf-pod5.yaml1
-rw-r--r--labs/nokia/idf-pod1.yaml2
-rw-r--r--labs/zte/idf-pod1.yaml1
-rw-r--r--labs/zte/idf-pod2.yaml2
-rw-r--r--labs/zte/idf-pod3.yaml2
15 files changed, 220 insertions, 179 deletions
diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2
index b77fa864..26f775df 100644
--- a/config/installers/joid/pod_config.yaml.j2
+++ b/config/installers/joid/pod_config.yaml.j2
@@ -5,170 +5,168 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+{%- set net_config = conf.idf.net_config %}
---
lab:
location: intel
racks:
- - rack: pod5
+ - rack: pod18
nodes:
- - name: {{ conf['nodes'][0]['name'] }}
- architecture: {{ conf['nodes'][0]['node']['arch'] }}
+ - name: {{ conf.nodes[0].name }}
+ architecture: {{ conf.nodes[0].node.arch }}
roles: [network, control]
nics:
- - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}
+ - ifname: {{ conf.nodes[0].interfaces[1].name }}{% if conf.nodes[0].interfaces[1].vlan | int > 0 %}.{{conf.nodes[0].interfaces[1].vlan}}{% endif %}
+ spaces: [admin]
+ mac: ["{{ conf.nodes[0].interfaces[1].mac_address }}"]
+ - ifname: {{ conf.nodes[0].interfaces[2].name }}{% if conf.nodes[0].interfaces[2].vlan | int > 0 %}.{{conf.nodes[0].interfaces[2].vlan}}{% endif %}
spaces: [data]
- mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}.{{ conf['nodes'][0]['interfaces'][0]['vlan'] }}
+ mac: ["{{ conf.nodes[0].interfaces[2].mac_address }}"]
+ - ifname: {{ conf.nodes[0].interfaces[0].name }}{% if conf.nodes[0].interfaces[0].vlan | int > 0 %}.{{conf.nodes[0].interfaces[0].vlan}}{% endif %}
spaces: [floating]
- mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}.{{ conf['nodes'][0]['interfaces'][1]['vlan'] }}
+ mac: ["{{ conf.nodes[0].interfaces[0].mac_address }}"]
+ - ifname: {{ conf.nodes[0].interfaces[3].name }}{% if conf.nodes[0].interfaces[3].vlan | int > 0 %}.{{conf.nodes[0].interfaces[3].vlan}}{% endif %}
spaces: [public]
- mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}
+ mac: ["{{ conf.nodes[0].interfaces[3].mac_address }}"]
+ - ifname: {{ conf.nodes[0].interfaces[3].name }}
spaces: [storage]
- mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][0]['interfaces'][2]['name'] }}
- spaces: [admin]
- mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"]
+ mac: ["{{ conf.nodes[0].interfaces[3].mac_address }}"]
power:
- type: {{ conf['nodes'][0]['remote_management']['type'] }}
- address: {{ conf['nodes'][0]['remote_management']['address'] }}
- user: {{ conf['nodes'][0]['remote_management']['user'] }}
- pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
- - name: {{ conf['nodes'][1]['name'] }}
- architecture: {{ conf['nodes'][1]['node']['arch'] }}
+ type: {{ conf.nodes[0].remote_management.type }}
+ address: {{ conf.nodes[0].remote_management.address }}
+ user: {{ conf.nodes[0].remote_management.user }}
+ pass: {{ conf.nodes[0].remote_management.pass }}
+ - name: {{ conf.nodes[1].name }}
+ architecture: {{ conf.nodes[1].node.arch }}
roles: [compute, control, storage]
nics:
- - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}
+ - ifname: {{ conf.nodes[1].interfaces[1].name }}{% if conf.nodes[1].interfaces[1].vlan | int > 0 %}.{{conf.nodes[1].interfaces[1].vlan}}{% endif %}
+ spaces: [admin]
+ mac: ["{{ conf.nodes[1].interfaces[1].mac_address }}"]
+ - ifname: {{ conf.nodes[1].interfaces[2].name }}{% if conf.nodes[1].interfaces[2].vlan | int > 0 %}.{{conf.nodes[1].interfaces[2].vlan}}{% endif %}
spaces: [data]
- mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}.{{ conf['nodes'][1]['interfaces'][0]['vlan'] }}
+ mac: ["{{ conf.nodes[1].interfaces[2].mac_address }}"]
+ - ifname: {{ conf.nodes[1].interfaces[0].name }}{% if conf.nodes[1].interfaces[0].vlan | int > 0 %}.{{conf.nodes[1].interfaces[0].vlan}}{% endif %}
spaces: [floating]
- mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}.{{ conf['nodes'][1]['interfaces'][1]['vlan'] }}
+ mac: ["{{ conf.nodes[1].interfaces[0].mac_address }}"]
+ - ifname: {{ conf.nodes[1].interfaces[3].name }}{% if conf.nodes[1].interfaces[3].vlan | int > 0 %}.{{conf.nodes[1].interfaces[3].vlan}}{% endif %}
spaces: [public]
- mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}
+ mac: ["{{ conf.nodes[1].interfaces[3].mac_address }}"]
+ - ifname: {{ conf.nodes[1].interfaces[3].name }}
spaces: [storage]
- mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
- spaces: [admin]
- mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"]
+ mac: ["{{ conf.nodes[1].interfaces[3].mac_address }}"]
power:
- type: {{ conf['nodes'][1]['remote_management']['type'] }}
- address: {{ conf['nodes'][1]['remote_management']['address'] }}
- user: {{ conf['nodes'][1]['remote_management']['user'] }}
- pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
- - name: {{ conf['nodes'][2]['name'] }}
- architecture: {{ conf['nodes'][2]['node']['arch'] }}
+ type: {{ conf.nodes[1].remote_management.type }}
+ address: {{ conf.nodes[1].remote_management.address }}
+ user: {{ conf.nodes[1].remote_management.user }}
+ pass: {{ conf.nodes[1].remote_management.pass }}
+ - name: {{ conf.nodes[2].name }}
+ architecture: {{ conf.nodes[2].node.arch }}
roles: [compute, control, storage]
nics:
- - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}
- spaces: [data]
- mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}.{{ conf['nodes'][2]['interfaces'][0]['vlan'] }}
+ - ifname: {{ conf.nodes[2].interfaces[1].name }}{% if conf.nodes[2].interfaces[1].vlan | int > 0 %}.{{conf.nodes[2].interfaces[1].vlan}}{% endif %}
+ spaces: [admin]
+ mac: ["{{ conf.nodes[2].interfaces[1].mac_address }}"]
+ - ifname: {{ conf.nodes[2].interfaces[2].name }}{% if conf.nodes[2].interfaces[2].vlan | int > 0 %}.{{conf.nodes[2].interfaces[2].vlan}}{% endif %}
spaces: [floating]
- mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}.{{ conf['nodes'][2]['interfaces'][1]['vlan'] }}
+ mac: ["{{ conf.nodes[2].interfaces[2].mac_address }}"]
+ - ifname: {{ conf.nodes[2].interfaces[0].name }}{% if conf.nodes[2].interfaces[0].vlan | int > 0 %}.{{conf.nodes[2].interfaces[0].vlan}}{% endif %}
spaces: [public]
- mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}
+ mac: ["{{ conf.nodes[2].interfaces[0].mac_address }}"]
+ - ifname: {{ conf.nodes[2].interfaces[3].name }}{% if conf.nodes[2].interfaces[3].vlan | int > 0 %}.{{conf.nodes[2].interfaces[3].vlan}}{% endif %}
+ spaces: [storage]
+ mac: ["{{ conf.nodes[2].interfaces[3].mac_address }}"]
+ - ifname: {{ conf.nodes[2].interfaces[3].name }}
spaces: [storage]
- mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }}
+ mac: ["{{ conf.nodes[2].interfaces[3].mac_address }}"]
power:
- type: {{ conf['nodes'][2]['remote_management']['type'] }}
- address: {{ conf['nodes'][2]['remote_management']['address'] }}
- user: {{ conf['nodes'][2]['remote_management']['user'] }}
- pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
- - name: {{ conf['nodes'][3]['name'] }}
- architecture: {{ conf['nodes'][3]['node']['arch'] }}
+ type: {{ conf.nodes[2].remote_management.type }}
+ address: {{ conf.nodes[2].remote_management.address }}
+ user: {{ conf.nodes[2].remote_management.user }}
+ pass: {{ conf.nodes[2].remote_management.pass }}
+ - name: {{ conf.nodes[3].name }}
+ architecture: {{ conf.nodes[3].node.arch }}
roles: [compute, storage]
nics:
- - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}
+ - ifname: {{ conf.nodes[3].interfaces[1].name }}{% if conf.nodes[3].interfaces[1].vlan | int > 0 %}.{{conf.nodes[3].interfaces[1].vlan}}{% endif %}
+ spaces: [admin]
+ mac: ["{{ conf.nodes[3].interfaces[1].mac_address }}"]
+ - ifname: {{ conf.nodes[3].interfaces[2].name }}{% if conf.nodes[3].interfaces[2].vlan | int > 0 %}.{{conf.nodes[3].interfaces[2].vlan}}{% endif %}
spaces: [data]
- mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}.{{ conf['nodes'][3]['interfaces'][0]['vlan'] }}
+ mac: ["{{ conf.nodes[3].interfaces[2].mac_address }}"]
+ - ifname: {{ conf.nodes[3].interfaces[0].name }}{% if conf.nodes[3].interfaces[0].vlan | int > 0 %}.{{conf.nodes[3].interfaces[0].vlan}}{% endif %}
spaces: [floating]
- mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}.{{ conf['nodes'][3]['interfaces'][1]['vlan'] }}
+ mac: ["{{ conf.nodes[3].interfaces[0].mac_address }}"]
+ - ifname: {{ conf.nodes[3].interfaces[3].name }}{% if conf.nodes[3].interfaces[3].vlan | int > 0 %}.{{conf.nodes[3].interfaces[3].vlan}}{% endif %}
spaces: [public]
- mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}
+ mac: ["{{ conf.nodes[3].interfaces[3].mac_address }}"]
+ - ifname: {{ conf.nodes[3].interfaces[3].name }}
spaces: [storage]
- mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }}
+ mac: ["{{ conf.nodes[3].interfaces[3].mac_address }}"]
power:
- type: {{ conf['nodes'][3]['remote_management']['type'] }}
- address: {{ conf['nodes'][3]['remote_management']['address'] }}
- user: {{ conf['nodes'][3]['remote_management']['user'] }}
- pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
- - name: {{ conf['nodes'][4]['name'] }}
- architecture: {{ conf['nodes'][4]['node']['arch'] }}
+ type: {{ conf.nodes[3].remote_management.type }}
+ address: {{ conf.nodes[3].remote_management.address }}
+ user: {{ conf.nodes[3].remote_management.user }}
+ pass: {{ conf.nodes[3].remote_management.pass }}
+ - name: {{ conf.nodes[4].name }}
+ architecture: {{ conf.nodes[4].node.arch }}
roles: [compute, storage]
nics:
- - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}
+ - ifname: {{ conf.nodes[4].interfaces[1].name }}{% if conf.nodes[4].interfaces[1].vlan | int > 0 %}.{{conf.nodes[4].interfaces[1].vlan}}{% endif %}
+ spaces: [admin]
+ mac: ["{{ conf.nodes[4].interfaces[1].mac_address }}"]
+ - ifname: {{ conf.nodes[4].interfaces[2].name }}{% if conf.nodes[4].interfaces[2].vlan | int > 0 %}.{{conf.nodes[4].interfaces[2].vlan}}{% endif %}
spaces: [data]
- mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}.{{ conf['nodes'][4]['interfaces'][0]['vlan'] }}
+ mac: ["{{ conf.nodes[4].interfaces[2].mac_address }}"]
+ - ifname: {{ conf.nodes[4].interfaces[0].name }}{% if conf.nodes[4].interfaces[0].vlan | int > 0 %}.{{conf.nodes[4].interfaces[0].vlan}}{% endif %}
spaces: [floating]
- mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}.{{ conf['nodes'][4]['interfaces'][1]['vlan'] }}
+ mac: ["{{ conf.nodes[4].interfaces[0].mac_address }}"]
+ - ifname: {{ conf.nodes[4].interfaces[3].name }}{% if conf.nodes[4].interfaces[3].vlan | int > 0 %}.{{conf.nodes[4].interfaces[3].vlan}}{% endif %}
spaces: [public]
- mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}
+ mac: ["{{ conf.nodes[4].interfaces[3].mac_address }}"]
+ - ifname: {{ conf.nodes[1].interfaces[2].name }}
spaces: [storage]
- mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
- - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
+ mac: ["{{ conf.nodes[4].interfaces[3].mac_address }}"]
power:
- type: {{ conf['nodes'][4]['remote_management']['type'] }}
- address: {{ conf['nodes'][4]['remote_management']['address'] }}
- user: {{ conf['nodes'][4]['remote_management']['user'] }}
- pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
+ type: {{ conf.nodes[4].remote_management.type }}
+ address: {{ conf.nodes[4].remote_management.address }}
+ user: {{ conf.nodes[4].remote_management.user }}
+ pass: {{ conf.nodes[4].remote_management.pass }}
floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
- ext-port: "ens785f0.505"
- dns: 8.8.8.8
+ ext-port: "nic1"
+ dns: {{ net_config.public.dns[0] }}
osdomainname:
-opnfv:
- release: f
- distro: xenial
- type: ha
- openstack: pike
- sdncontroller:
- - type: nosdn
- storage:
- - type: ceph
- disk: /dev/sdb
- feature: odl_l2
- spaces:
- - type: admin
- bridge: brAdm
- cidr: 10.5.1.0/24
- gateway: 10.5.1.1
- vlan:
- - type: data
- bridge: brData
- cidr: 10.5.12.0/24
- gateway:
- vlan:
- - type: storage
- bridge: brStor
- cidr: 10.5.13.0/24
- gateway:
- vlan:
- - type: public
- bridge: brMgmt
- cidr: 10.5.14.0/24
- gateway:
- vlan: 504
- - type: floating
- bridge: brPublic
- cidr: 10.5.15.0/24
- gateway:
- vlan: 505
- - type: external
- bridge: brExt
- cidr:
- gateway:
- ipaddress: 10.2.117.92
- vlan:
+ opnfv:
+ release: f
+ distro: xenial
+ type: noha
+ openstack: pike
+ sdncontroller:
+ - type: nosdn
+ storage:
+ - type: ceph
+ disk: /dev/sdb
+ feature: odl_l2
+ spaces:
+ - type: admin # admin
+ bridge: {{ net_config.admin.bridge }}
+ cidr: {{ net_config.admin.network }}/{{ net_config.admin.mask }}
+ gateway: {{ net_config.admin.gateway }}
+ vlan:
+ - type: data # mgmt
+ cidr: {{ net_config.mgmt.network }}/{{ net_config.mgmt.mask }}
+ gateway:
+ vlan:
+ - type: storage # storage
+ cidr: {{ net_config.storage.network }}/{{ net_config.storage.mask }}
+ gateway:
+ vlan:
+ - type: floating # private
+ bridge: {{ net_config.private.bridge }}
+ cidr: {{ net_config.private.network }}/{{ net_config.private.mask }}
+ gateway:
+ vlan:
+ - type: public # public
+ cidr: {{ net_config.public.network }}/{{ net_config.public.mask }}
+ gateway: {{ net_config.public.gateway }}
+ vlan: {% if net_config.public.vlan | int > 0 %}{{ net_config.public.vlan }}{% endif %}
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index 31998eba..17f01506 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config:
oob:
ip-range: 10.0.1.54-10.0.1.58
diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml
index d6944795..281e63aa 100644
--- a/labs/bii/idf-pod1.yaml
+++ b/labs/bii/idf-pod1.yaml
@@ -12,7 +12,7 @@ idf:
version: 0.1
# NOTE: Temporarily disable Daisy check, since it requires 'storage' network
# to be defined in 'idf.net_config' below.
- installer: ['apex', 'compass4nfv', 'fuel', 'joid']
+ installer: ['apex', 'compass4nfv', 'fuel']
net_config:
oob: # IPMI management network
interface: 0
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 6c02a4ce..5f990821 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config:
oob:
interface: 0
diff --git a/labs/ericsson/idf-pod2.yaml b/labs/ericsson/idf-pod2.yaml
index 01f87faa..5e0db5af 100644
--- a/labs/ericsson/idf-pod2.yaml
+++ b/labs/ericsson/idf-pod2.yaml
@@ -9,4 +9,4 @@
idf:
version: 0.1
# NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['apex', 'compass4nfv', 'daisy']
diff --git a/labs/huawei/idf-pod1.yaml b/labs/huawei/idf-pod1.yaml
index 7e2cd721..00933bc4 100644
--- a/labs/huawei/idf-pod1.yaml
+++ b/labs/huawei/idf-pod1.yaml
@@ -12,7 +12,7 @@
idf:
version: 0.1
# NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['apex', 'compass4nfv', 'daisy']
net_config:
mgmt:
interface: 1
diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml
index bd8c49ec..5adf23d4 100644
--- a/labs/intel/idf-pod18.yaml
+++ b/labs/intel/idf-pod18.yaml
@@ -8,5 +8,42 @@
---
idf:
version: 0.1
- # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['joid']
+ net_config:
+ # NOTE: Network names are likely to change after the PDF spec is updated
+ oob:
+ interface: 0
+ ip-range:
+ vlan:
+ admin: # admin
+ interface: 1
+ vlan: native
+ network: 10.10.181.0
+ mask: 24
+ gateway: 10.10.181.2
+ bridge: brAdm
+ mgmt: # data
+ interface: 2
+ vlan:
+ network: 10.10.182.0
+ mask: 24
+ storage: # storage
+ interface: 3
+ vlan:
+ network: 10.10.182.0
+ mask: 24
+ private: # floating
+ interface:
+ vlan:
+ network: 10.10.180.0
+ mask: 24
+ bridge: brExt
+ public: # public
+ interface:
+ vlan: 1183
+ network: 10.10.185.0
+ mask: 24
+ gateway: 10.10.185.1
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
index 24c14fda..088ef358 100644
--- a/labs/intel/pod18.yaml
+++ b/labs/intel/pod18.yaml
@@ -33,25 +33,25 @@ jumphost:
disk_type: hdd
disk_interface: sas
disk_rotation: 15000
- os: centos-7.2.1611
+ os: ubuntu-16.04
remote_params: &remoteparas
type: ipmi
versions:
- 1.0
- 2.0
- user: changeme
- pass: changeme
+ user: root
+ pass: root
remote_management:
<<: *remoteparas
address: 10.10.180.10
mac_address: "A4:BF:01:16:31:98"
interfaces:
- name: 'nic1'
- address: 10.10.180.20/24
+ address: 10.10.180.20
mac_address: "A4:BF:01:16:31:96"
vlan: native
- name: 'nic2'
- address: 10.10.181.20/24
+ address: 10.10.181.20
mac_address: "A4:BF:01:16:31:97"
vlan: native
nodes:
@@ -78,43 +78,43 @@ nodes:
disk_rotation: 15000
remote_management:
<<: *remoteparas
- address: 10.10.180.11/24
+ address: 10.10.180.11
mac_address: "A4:BF:01:14:40:18"
interfaces:
- name: 'nic1'
speed: 1gb
features:
- address: 10.10.180.21/24
+ address: 10.10.180.21
mac_address: "A4:BF:01:14:40:16"
vlan: native
- name: 'nic2'
speed: 1gb
features:
- address: 10.10.181.21/24
+ address: 10.10.181.21
mac_address: "A4:BF:01:14:40:17"
vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.182.21/24
+ address: 10.10.182.21
mac_address: "3C:FD:FE:A4:9F:A0"
vlan: native
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.183.21/24
+ address: 10.10.183.21
mac_address: "3C:FD:FE:A4:9F:A1"
- vlan: native
+ vlan: 1183
- name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.184.21/24
+ address: 10.10.184.21
mac_address: "3C:FD:FE:A4:9F:A2"
vlan: native
- name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.185.21/24
+ address: 10.10.185.21
mac_address: "3C:FD:FE:A4:9F:A3"
vlan: native
- name: pod18-node2
@@ -122,43 +122,43 @@ nodes:
disks: *disks
remote_management:
<<: *remoteparas
- address: 10.10.180.12/24
+ address: 10.10.180.12
mac_address: "A4:BF:01:16:31:1F"
interfaces:
- name: 'nic1'
speed: 1gb
features:
- address: 10.10.180.22/24
+ address: 10.10.180.22
mac_address: "A4:BF:01:16:31:1E"
vlan: native
- name: 'nic2'
speed: 1gb
features:
- address: 10.10.181.22/24
+ address: 10.10.181.22
mac_address: "A4:BF:01:16:31:1F"
vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.182.22/24
+ address: 10.10.182.22
mac_address: "3C:FD:FE:A4:A0:30"
vlan: native
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.183.22/24
+ address: 10.10.183.22
mac_address: "3C:FD:FE:A4:A0:31"
- vlan: native
+ vlan: 1183
- name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.184.22/24
+ address: 10.10.184.22
mac_address: "3C:FD:FE:A4:A0:32"
vlan: native
- name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.185.22/24
+ address: 10.10.185.22
mac_address: "3C:FD:FE:A4:A0:33"
vlan: native
- name: pod18-node3
@@ -166,43 +166,43 @@ nodes:
disks: *disks
remote_management:
<<: *remoteparas
- address: 10.10.180.13/24
+ address: 10.10.180.13
mac_address: "A4:BF:01:16:30:F8"
interfaces:
- name: 'nic1'
speed: 1gb
features:
- address: 10.10.180.23/24
+ address: 10.10.180.23
mac_address: "A4:BF:01:16:30:F6"
vlan: native
- name: 'nic2'
speed: 1gb
features:
- address: 10.10.181.23/24
+ address: 10.10.181.23
mac_address: "A4:BF:01:16:30:F7"
vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.182.23/24
+ address: 10.10.182.23
mac_address: "3C:FD:FE:A4:9E:48"
vlan: native
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.183.23/24
+ address: 10.10.183.23
mac_address: "3C:FD:FE:A4:9E:49"
- vlan: native
+ vlan: 1183
- name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.184.23/24
+ address: 10.10.184.23
mac_address: "3C:FD:FE:A4:9E:4A"
vlan: native
- name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.185.23/24
+ address: 10.10.185.23
mac_address: "3C:FD:FE:A4:9E:4B"
vlan: native
- name: pod18-node4
@@ -210,43 +210,43 @@ nodes:
disks: *disks
remote_management:
<<: *remoteparas
- address: 10.10.180.14/24
+ address: 10.10.180.14
mac_address: "A4:BF:01:14:72:0F"
interfaces:
- name: 'nic1'
speed: 1gb
features:
- address: 10.10.180.24/24
+ address: 10.10.180.24
mac_address: "A4:BF:01:14:72:0D"
vlan: native
- name: 'nic2'
speed: 1gb
features:
- address: 10.10.181.24/24
+ address: 10.10.181.24
mac_address: "A4:BF:01:14:72:0E"
vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.182.24/24
+ address: 10.10.182.24
mac_address: "3C:FD:FE:A4:9D:E8"
vlan: native
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.183.24/24
+ address: 10.10.183.24
mac_address: "3C:FD:FE:A4:9D:E9"
- vlan: native
+ vlan: 1183
- name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.184.24/24
+ address: 10.10.184.24
mac_address: "3C:FD:FE:A4:9D:EA"
vlan: native
- name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.185.24/24
+ address: 10.10.185.24
mac_address: "3C:FD:FE:A4:9D:EB"
vlan: native
- name: pod18-node5
@@ -254,42 +254,42 @@ nodes:
disks: *disks
remote_management:
<<: *remoteparas
- address: 10.10.180.15/24
+ address: 10.10.180.15
mac_address: "A4:BF:01:14:71:70"
interfaces:
- name: 'nic1'
speed: 1gb
features:
- address: 10.10.180.25/24
+ address: 10.10.180.25
mac_address: "A4:BF:01:14:71:68"
vlan: native
- name: 'nic2'
speed: 1gb
features:
- address: 10.10.181.25/24
+ address: 10.10.181.25
mac_address: "A4:BF:01:14:71:69"
vlan: native
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.182.25/24
+ address: 10.10.182.25
mac_address: "3C:FD:FE:A4:A1:08"
vlan: native
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.183.25/24
+ address: 10.10.183.25
mac_address: "3C:FD:FE:A4:A1:09"
- vlan: native
+ vlan: 1183
- name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.184.25/24
+ address: 10.10.184.25
mac_address: "3C:FD:FE:A4:A1:0A"
vlan: native
- name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address: 10.10.185.25/24
+ address: 10.10.185.25
mac_address: "3C:FD:FE:A4:A1:0B"
vlan: native
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index b916707a..a8c370dd 100644
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config:
# NOTE: Network names are likely to change after the PDF spec is updated
oob:
diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml
index c8f6cf27..69fd1711 100644
--- a/labs/lf/idf-pod4.yaml
+++ b/labs/lf/idf-pod4.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config: &net_config
oob:
interface: 0
diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index c1af4ed8..6907f02c 100644
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config:
oob:
interface: 0
diff --git a/labs/nokia/idf-pod1.yaml b/labs/nokia/idf-pod1.yaml
index 83aba95b..3fc47e20 100644
--- a/labs/nokia/idf-pod1.yaml
+++ b/labs/nokia/idf-pod1.yaml
@@ -9,4 +9,4 @@
idf:
version: 0.1
# NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['apex', 'compass4nfv', 'daisy']
diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml
index a7428fd9..6e8c1349 100644
--- a/labs/zte/idf-pod1.yaml
+++ b/labs/zte/idf-pod1.yaml
@@ -10,6 +10,7 @@
idf:
version: 0.1
+ installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
net_config:
oob:
interface: 0
diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml
index 960151d0..0d8d7f67 100644
--- a/labs/zte/idf-pod2.yaml
+++ b/labs/zte/idf-pod2.yaml
@@ -11,7 +11,7 @@
idf:
version: 0.1
# NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['apex', 'compass4nfv', 'daisy']
net_config:
oob:
interface: 0
diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml
index 1246a673..116bac59 100644
--- a/labs/zte/idf-pod3.yaml
+++ b/labs/zte/idf-pod3.yaml
@@ -11,7 +11,7 @@
idf:
version: 0.1
# NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
- installer: ['apex', 'compass4nfv', 'daisy', 'joid']
+ installer: ['apex', 'compass4nfv', 'daisy']
net_config:
oob:
interface: 0