diff options
55 files changed, 1893 insertions, 158 deletions
@@ -47,7 +47,7 @@ coverage.xml *.log # Sphinx documentation -docs/_build/ +docs/_build/* # PyBuilder target/ @@ -58,7 +58,6 @@ target/ *~ .*.sw? -/docs_build/ /docs_output/ /releng/ @@ -2,8 +2,8 @@ Project: Testbed infrastructure (Pharos) Project Creation Date: January 8, 2015 Project Category: Integration & Testing Lifecycle State: Mature -Primary Contact: Julien Zhang (zhang.jun3g@zte.com.cn) -Project Lead: Julien Zhang (zhang.jun3g@zte.com.cn) +Primary Contact: Jack Morgan <jack@jento.io> +Project Lead: Jack Morgan <jack@jento.io> Jira Project Name: Testbed infrastructure project Jira Project Prefix: PHAROS Mailing list tag: [pharos] @@ -16,8 +16,8 @@ Alexandru Avadanii <Alexandru.Avadanii@enea.com> Aric Gardner <agardner@linuxfoundation.org> Fatih Degirmenci <fatih.degirmenci@ericsson.com> Guillermo Herrero <guillermo.herrero@enea.com> -Jack Morgan <jack.morgan@intel.com> -Julien Zhang <zhang.jun3g@zte.com.cn> +Jack Morgan <jack@jento.io> +Julien Zhang <julienjut@gmail.com> Parker Berberian <pberberian@iol.unh.edu> Trevor Bramwell <tbramwell@linuxfoundation.org> Trevor Cooper <trevor.cooper@intel.com> diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 00000000..d889f04c --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,79 @@ +--- +project: 'Testbed infrastructure (Pharos)' +project_creation_date: 'January 8, 2015' +project_category: 'Integration & Testing' +lifecycle_state: 'Mature' +project_lead: &opnfv_pharos_ptl + name: 'Jack Morgan' + email: 'jack@jento.io' + id: 'jentoio' + company: 'none' + timezone: 'PDT(UTC-7)' +primary_contact: *opnfv_pharos_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.opnfv.org/projects/PHAROS' + key: 'PHAROS' +mailing_list: + type: 'mailman2' + url: 'opnfv-tech-discuss@lists.opnfv.org' + tag: '[pharos]' +realtime_discussion: + type: irc + server: 'freenode.net' + channel: '#opnfv-pharos' +meetings: + - type: 'gotomeeting+irc' + agenda: # eg: 'https://wiki.opnfv.org/display/' + url: # eg: 'https://global.gotomeeting.com/join/819733085' + server: 'freenode.net' + channel: '#opnfv-meeting' + repeats: 'weekly' + time: # eg: '16:00 UTC' +repositories: + - 'pharos' + - 'pharos-tools' +committers: + - <<: *opnfv_pharos_ptl + - name: 'Wenjing Chu' + email: 'chu.wenjing@gmail.com' + company: 'gmail.com' + id: 'wenjing' + - name: 'Morgan Richomme' + email: 'morgan.richomme@orange.com' + company: 'orange.com' + id: 'mrichomme' + - name: 'Trevor Cooper' + email: 'trevor.cooper@intel.com' + company: 'intel.com' + id: 'trev' + - name: 'Jose Lausuch' + email: 'jalausuch@suse.com' + company: 'suse.com' + id: 'jose.lausuch' + - name: 'Fatih Degirmenci' + email: 'fdegir@gmail.com' + company: 'gmail.com' + id: 'fdegir' + - name: 'julien zhang' + email: 'julienjut@gmail.com' + company: 'gmail.com' + id: 'Julien-zte' + - name: 'Aric Gardner' + email: 'agardner@linuxfoundation.org' + company: 'linuxfoundation.org' + id: 'agardner' + - name: 'Trevor Bramwell' + email: 'tbramwell@linuxfoundation.org' + company: 'linuxfoundation.org' + id: 'bramwelt' + - name: 'Alexandru Avadanii' + email: 'Alexandru.Avadanii@enea.com' + company: 'enea.com' + id: 'AlexandruAvadanii' + - name: 'Guillermo Herrero' + email: 'guillermo.herrero@enea.com' + company: 'enea.com' + id: 'gherrero' +tsc: + approval: 'http//meetbot.opnfv.org/meetings/opnfv-meeting/' diff --git a/config/installers/compass4nfv/network_ocl.yml.j2 b/config/installers/compass4nfv/network_ocl.yml.j2 index f435538c..949b491d 100644 --- a/config/installers/compass4nfv/network_ocl.yml.j2 +++ b/config/installers/compass4nfv/network_ocl.yml.j2 @@ -31,7 +31,7 @@ sys_intf_mappings: - name: storage interface: eth2 - vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} + vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} # not a good fit type: vlan role: - controller diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2 index b9693d11..c0a5d329 100644 --- a/config/installers/fuel/net_macros.j2 +++ b/config/installers/fuel/net_macros.j2 @@ -5,24 +5,25 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -{%- macro linux_network_interfaces_nic(nics) -%} +{%- macro linux_network_interfaces_nic(nics, proto = 'manual') -%} {%- for nic in nics %} {{ nic }}: enabled: true type: eth - proto: manual + proto: {{ proto }} mtu: ${_param:interface_mtu} name: {{ nic }} noifupdown: true {%- endfor %} {%- endmacro -%} -{%- macro linux_network_interfaces_vlan(vlans) -%} +{%- macro linux_network_interfaces_vlan(vlans, proto = 'manual') -%} {%- for vlan in vlans %} {%- if vlan | int > 0 %} {{ vlans[vlan] }}.{{ vlan }}: enabled: true - proto: manual + proto: {{ proto }} + mtu: ${_param:interface_mtu} type: vlan name: {{ vlans[vlan] }}.{{ vlan }} use_interfaces: @@ -34,3 +35,15 @@ {%- macro interface_str(nic, vlan = 0) -%} {{ nic }}{% if vlan | int > 0 %}.{{ vlan }}{% endif %} {%- endmacro -%} + +{%- macro vpp_interface_str(speed, pci_addr, driver = '') -%} + {%- set p = pci_addr.replace('.', ':').split(':') -%} + {%- set s = 'Ethernet%d/%d/%d' | format(p[-3] | int(0, 16), + p[-2] | int(0, 16), + p[-1] | int(0, 16)) -%} + {%- if 'vfio' in driver -%} + VirtualFunction{{ s }} + {%- else -%} + {% if '40g' in speed %}Forty{% elif '10g' in speed %}Ten{% endif %}Gigabit{{ s }} + {%- endif -%} +{%- endmacro -%} diff --git a/config/installers/fuel/net_map.j2 b/config/installers/fuel/net_map.j2 index a12159ea..bc1ac789 100644 --- a/config/installers/fuel/net_map.j2 +++ b/config/installers/fuel/net_map.j2 @@ -36,6 +36,7 @@ {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) #} {%- for role in [ctl01, cmp001] %} + {%- if role.idx < conf.nodes | length %} {%- set node = conf.idf.fuel.network.node[role.idx] %} {%- do role.update({ 'nic_mcp': node.interfaces[idx_mcp], @@ -45,6 +46,7 @@ 'nic_public': node.interfaces[idx_public], 'bus_private': node.busaddr[idx_private]}) %} {#- PCI addresses are only used on computes for DPDK on private net #} + {%- endif %} {%- endfor %} {%- set net_admin = [net.admin.network, net.admin.mask] | join("/") %} @@ -101,6 +103,8 @@ 'opnfv_openstack_control_node02_pxe_admin_address', 'opnfv_openstack_control_node03_pxe_admin_address', 'opnfv_opendaylight_server_node01_pxe_admin_address', + 'opnfv_opendaylight_server_node02_pxe_admin_address', + 'opnfv_opendaylight_server_node03_pxe_admin_address', 'opnfv_stacklight_monitor_node01_pxe_admin_address', 'opnfv_stacklight_monitor_node02_pxe_admin_address', 'opnfv_stacklight_monitor_node03_pxe_admin_address', @@ -140,7 +144,10 @@ 'opnfv_openstack_control_node01_address', 'opnfv_openstack_control_node02_address', 'opnfv_openstack_control_node03_address', - 'opnfv_opendaylight_server_node01_single_address', + 'opnfv_opendaylight_server_address', + 'opnfv_opendaylight_server_node01_address', + 'opnfv_opendaylight_server_node02_address', + 'opnfv_opendaylight_server_node03_address', 'opnfv_stacklight_monitor_address', 'opnfv_stacklight_monitor_node01_address', 'opnfv_stacklight_monitor_node02_address', @@ -163,7 +170,8 @@ 'opnfv_openstack_gateway_node03_external_address', 'opnfv_openstack_control_node01_external_address', 'opnfv_openstack_control_node02_external_address', - 'opnfv_openstack_control_node03_external_address'] %} + 'opnfv_openstack_control_node03_external_address', + 'opnfv_opendaylight_server_external_address'] %} {%- set net_private_hosts = [ 'opnfv_openstack_gateway_node01_tenant_address', diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 769e55db..657bc2c1 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -12,25 +12,36 @@ parameters: maas: region: machines: -{%- for node in conf.nodes %} -{%- if node.node.type == 'baremetal' %} - -{%- if loop.index > nm.cmp001.idx %} - {{ 'cmp%03d' | format(loop.index - nm.cmp001.idx) }}: -{%- else %} - {{ 'kvm%02d' | format(loop.index) }}: -{%- endif %} + {%- set ctl_roles = 3 if 'virtual' not in conf else conf.virtual.nodes.control | length %} + {%- set has_cmp = True if 'virtual' not in conf else 'compute' in conf.virtual.nodes %} + {%- for node in conf.nodes %} + {%- if (node.node.type == 'baremetal' and ( + (has_cmp and loop.index > nm.cmp001.idx) or loop.index0 < ctl_roles)) %} + {%- if loop.index > nm.cmp001.idx %} + cmp{{ '%03d' | format(loop.index - nm.cmp001.idx) }}: + {%- elif 'virtual' not in conf %} {#- strictly for Pharos verify job #} + kvm{{ '%02d' | format(loop.index) }}: + {%- else %} + {{ conf.virtual.nodes.control[loop.index0] }}: + {%- endif %} interface: mac: {{ node.interfaces[nm.idx_admin].mac_address }} power_parameters: power_address: {{ node.remote_management.address.rsplit('/')[0] }} - power_password: {{ node.remote_management.pass }} + power_pass: {{ node.remote_management.pass }} power_type: {{ node.remote_management.type }} power_user: {{ node.remote_management.user }} architecture: {{ node.node.arch | dpkg_arch }}/generic - distro_series: xenial + distro_series: bionic hwe_kernel: ${_param:hwe_kernel} - -{%- endif %} -{%- endfor %} + {%- if loop.index > nm.cmp001.idx %} + disk_layout: + type: lvm + root_device: sda + volume_group: vgroot + volume_name: lvroot + volume_size: 100 + {%- endif %} + {%- endif %} + {%- endfor %} {%- endif %} diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2 index 26f775df..1ba966d9 100644 --- a/config/installers/joid/pod_config.yaml.j2 +++ b/config/installers/joid/pod_config.yaml.j2 @@ -149,9 +149,9 @@ lab: feature: odl_l2 spaces: - type: admin # admin - bridge: {{ net_config.admin.bridge }} + bridge: {{ net_config.admin.bridge }} # admin bridge cidr: {{ net_config.admin.network }}/{{ net_config.admin.mask }} - gateway: {{ net_config.admin.gateway }} + gateway: {{ net_config.admin.gateway }} # admin gateway vlan: - type: data # mgmt cidr: {{ net_config.mgmt.network }}/{{ net_config.mgmt.mask }} @@ -162,11 +162,11 @@ lab: gateway: vlan: - type: floating # private - bridge: {{ net_config.private.bridge }} + bridge: {{ net_config.private.bridge }} # 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 %} + vlan: {% if net_config.public.vlan | int > 0 %}{{ net_config.public.vlan }}{% endif %} # public vlan diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml index 2bb880d1..7546279d 100644 --- a/config/pdf/idf-pod1.schema.yaml +++ b/config/pdf/idf-pod1.schema.yaml @@ -42,6 +42,13 @@ definitions: type: ['string', 'null'] required: ['admin', 'mgmt', 'private', 'public'] additionalProperties: false + trunks: + type: 'object' + properties: + mgmt: + type: 'boolean' + required: ['mgmt'] + additionalProperties: false required: ['bridges'] additionalProperties: false maas: @@ -56,6 +63,8 @@ definitions: network: type: 'object' properties: + interface_mtu: + type: 'number' ntp_strata_host1: type: 'string' ntp_strata_host2: @@ -136,6 +145,20 @@ definitions: additionalProperties: false osa: v0.1: + type: 'object' + properties: + nodes_roles: + type: 'object' + groups: + type: 'object' + hostnames: + type: 'object' + network: + type: 'object' + required: ['nodes_roles', 'groups', 'hostnames', 'network'] + additionalProperties: false + kubespray: + v0.1: type: ['object', 'null'] # NOTE: To be properly modeled by XCI maintainers @@ -157,7 +180,7 @@ properties: type: 'array' items: type: 'string' - enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid', 'osa'] + enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid', 'osa', 'kubespray'] net_config: type: 'object' compass: @@ -168,6 +191,8 @@ properties: type: 'object' osa: type: ['object', 'null'] + kubespray: + type: ['object', 'null'] required: ['version'] additionalProperties: false ############################################################################ @@ -187,12 +212,16 @@ properties: $ref: '#/definitions/fuel/v0.1' osa: $ref: '#/definitions/osa/v0.1' + kubespray: + $ref: '#/definitions/kubespray/v0.1' fuel: required: ['net_config'] daisy: required: ['net_config'] osa: required: ['net_config'] + kubespray: + required: ['net_config'] xci: type: 'object' # NOTE: To be properly modeled by XCI maintainers diff --git a/config/pdf/pod1.schema.yaml b/config/pdf/pod1.schema.yaml index 33b2d8c3..4de326ed 100644 --- a/config/pdf/pod1.schema.yaml +++ b/config/pdf/pod1.schema.yaml @@ -74,6 +74,10 @@ definitions: type: 'string' pass: type: 'string' + port: + type: 'number' + privilege_level: + type: 'string' type: type: 'string' versions: diff --git a/config/utils/check-jinja2.sh b/config/utils/check-jinja2.sh index d42a2cde..1fcdb9a2 100755 --- a/config/utils/check-jinja2.sh +++ b/config/utils/check-jinja2.sh @@ -51,8 +51,8 @@ while IFS= read -r lab_config; do continue fi while IFS= read -r jinja_template; do - pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template}" \ - "-i $(dirname "${jinja_template}")" + pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template} \ + -i $(dirname "${jinja_template}")" if ${pdf_gen_cmd} > "${TMPF}"; then ((pdf_inst_pass+=1)) echo "[GENERATE] [OK] ${pdf_gen_cmd}" diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 00000000..f0c2a787 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,8 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation 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 +############################################################################## +from docs_conf.conf import * # noqa: F401,F403 diff --git a/docs/conf.yaml b/docs/conf.yaml new file mode 100644 index 00000000..b3782ee9 --- /dev/null +++ b/docs/conf.yaml @@ -0,0 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation 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 +############################################################################## +--- +project_cfg: opnfv +project: PHAROS diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 00000000..00450768 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,9 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation 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 +############################################################################## +lfdocs-conf +sphinx_opnfv_theme diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml new file mode 100644 index 00000000..39aac781 --- /dev/null +++ b/labs/arm/idf-pod10.yaml @@ -0,0 +1,148 @@ +############################################################################## +# Copyright (c) 2018 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 10 installer descriptor file ### + +idf: + version: 0.1 + # NOTE: Compass & Joid are not supported on this POD since they require at + # least 3 network ports on all nodes. + installer: ['fuel'] + net_config: + oob: + ip-range: 10.0.21.2-10.0.21.7 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2443 + network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 1 + vlan: 2444 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2445-2460 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.21.0 + ip-range: 10.0.21.100-10.0.21.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.21.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin20_br0' + mgmt: 'mgmt20_br0' + private: ~ + public: 'public20_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 25 + network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces_intel + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'enp5s0f0' + - 'enp5s0f1' + - 'eno2' + - 'eno3' + - 'eno4' + busaddr: &busaddr_intel + # Bus-info reported by `ethtool -i ethX` + - '0000:02:00.0' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:02:00.1' + - '0000:03:00.0' + - '0000:03:00.1' + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: &interfaces_arm + - 'enP5p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: &busaddr_arm + - '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_arm + busaddr: *busaddr_arm + reclass: + node: + - compute_params: &compute_params_intel + common: + nova_cpu_pinning: &nova_cpu_pinning_common_intel "2-15" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_intel + dpdk: + nova_cpu_pinning: "4-15" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_intel + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0xc" + compute_ovs_dpdk_socket_mem: "2048" + compute_ovs_dpdk_lcore_mask: "0xc" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params_intel + - compute_params: *compute_params_intel + - compute_params: &compute_params_cavium + common: + nova_cpu_pinning: &nova_cpu_pinning_common_arm "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_arm + dpdk: + nova_cpu_pinning: "12-47" + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + compute_kernel_isolcpu: *nova_cpu_pinning_common_arm + compute_dpdk_driver: vfio + compute_ovs_pmd_cpu_mask: "0x300" + compute_ovs_dpdk_socket_mem: "2048" + compute_ovs_dpdk_lcore_mask: "0xC00" + compute_ovs_memory_channels: "2" + dpdk0_driver: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params_cavium diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml index a5191319..09fe4cb6 100644 --- a/labs/arm/idf-pod5.yaml +++ b/labs/arm/idf-pod5.yaml @@ -17,6 +17,7 @@ idf: oob: ip-range: 10.0.8.3-10.0.8.10 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -34,7 +35,7 @@ idf: network: 10.2.0.0 mask: 24 private: - interface: 1 + interface: 2 vlan: 2185-2200 network: 10.1.0.0 mask: 24 @@ -76,10 +77,18 @@ idf: busaddr: *busaddr - interfaces: *interfaces busaddr: *busaddr - - interfaces: *interfaces - busaddr: *busaddr - - interfaces: *interfaces - busaddr: *busaddr + - interfaces: &interfaces_dual + - 'eth0' + - 'eth1' + - 'enp1s0f0' + - 'enp1s0f1' + busaddr: &busaddr_dual + - 'e0700000.xgmac' + - 'e0900000.xgmac' + - '0000:01:00.0' + - '0000:01:00.1' + - interfaces: *interfaces_dual + busaddr: *busaddr_dual reclass: node: - compute_params: &compute_params @@ -95,12 +104,12 @@ idf: compute_hugepages_count: 8192 compute_hugepages_mount: /mnt/hugepages_2M compute_kernel_isolcpu: *nova_cpu_pinning_common - compute_dpdk_driver: vfio + compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0xc" compute_ovs_dpdk_socket_mem: "4096" compute_ovs_dpdk_lcore_mask: "0xc" compute_ovs_memory_channels: "2" - dpdk0_driver: vfio-pci + dpdk0_driver: igb_uio dpdk0_n_rxq: 2 - compute_params: *compute_params - compute_params: *compute_params diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml index 395a7fb3..6d6c9c37 100644 --- a/labs/arm/idf-pod6.yaml +++ b/labs/arm/idf-pod6.yaml @@ -15,6 +15,7 @@ idf: oob: ip-range: 10.0.1.54-10.0.1.58 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -97,9 +98,9 @@ idf: compute_kernel_isolcpu: *nova_cpu_pinning_common dpdk: nova_cpu_pinning: "12-47" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: *nova_cpu_pinning_common compute_dpdk_driver: vfio compute_ovs_pmd_cpu_mask: "0x300" diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml index 463a1f7e..2cc681bf 100644 --- a/labs/arm/idf-pod7.yaml +++ b/labs/arm/idf-pod7.yaml @@ -17,6 +17,7 @@ idf: oob: ip-range: 10.0.16.2-10.0.16.6 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -99,9 +100,9 @@ idf: compute_kernel_isolcpu: *nova_cpu_pinning_common_a dpdk: nova_cpu_pinning: "4-47" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: *nova_cpu_pinning_common_a compute_dpdk_driver: vfio compute_ovs_pmd_cpu_mask: "0xc" diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml index e9464846..f5ef7241 100644 --- a/labs/arm/idf-pod8.yaml +++ b/labs/arm/idf-pod8.yaml @@ -15,6 +15,7 @@ idf: oob: ip-range: 10.0.19.2-10.0.19.7 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -95,9 +96,9 @@ idf: compute_kernel_isolcpu: *nova_cpu_pinning_common dpdk: nova_cpu_pinning: "12-47" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: *nova_cpu_pinning_common compute_dpdk_driver: vfio compute_ovs_pmd_cpu_mask: "0x300" diff --git a/labs/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml index 3b930793..b6252d36 100644 --- a/labs/arm/idf-pod9.yaml +++ b/labs/arm/idf-pod9.yaml @@ -15,6 +15,7 @@ idf: oob: ip-range: 10.0.20.2-10.0.20.7 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -55,8 +56,8 @@ idf: public: 'public19_br0' maas: # MaaS timeouts (in minutes) - timeout_comissioning: 10 - timeout_deploying: 18 + timeout_comissioning: 14 + timeout_deploying: 24 network: node: # Ordered-list, index should be in sync with node index in PDF @@ -99,9 +100,9 @@ idf: compute_kernel_isolcpu: *nova_cpu_pinning_common dpdk: nova_cpu_pinning: "12-47" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: *nova_cpu_pinning_common compute_dpdk_driver: vfio compute_ovs_pmd_cpu_mask: "0x300" diff --git a/labs/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml index 0cc24974..85529187 100644 --- a/labs/arm/idf-virtual2.yaml +++ b/labs/arm/idf-virtual2.yaml @@ -15,6 +15,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -26,6 +27,7 @@ idf: interface: 1 # when used, should be second vnet interface, untagged vlan: native network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra mask: 24 storage: interface: 4 @@ -34,13 +36,14 @@ idf: mask: 24 private: interface: 2 - vlan: native + vlan: 1000-1999 network: 10.1.0.0 mask: 24 public: interface: 3 vlan: native network: 10.0.9.0 + ip-range: 10.0.9.100-10.0.9.253 # Some IPs are in use by lab infra mask: 24 gateway: 10.0.9.254 dns: @@ -54,6 +57,7 @@ idf: private: ~ public: 'public' network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml new file mode 100644 index 00000000..0199c584 --- /dev/null +++ b/labs/arm/pod10.yaml @@ -0,0 +1,322 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +### Enea ARM POD 10 descriptor file ### + +version: 1.0 +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 +############################################################################## +jumphost: + name: jenkins-slave-arm-pod10 + node: + type: baremetal + vendor: Dell + model: PowerEdge R440 + arch: x86_64 + cpus: 1 + cpu_cflags: skylake + cores: 16 + memory: 96GB + disks: + - name: disk1 + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + 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: 10.0.21.7 + mac_address: "D0:94:66:87:55:32" + interfaces: + # eno1 + - mac_address: "d0:94:66:87:55:38" + speed: 1gb + features: '' + name: 'nic1' + # eno2 + - mac_address: "d0:94:66:87:55:39" + speed: 1gb + features: '' + name: 'nic2' +############################################################################## +nodes: + - name: intel2660-1 + node: &nodeparams + type: baremetal + vendor: Dell + model: PowerEdge R430 + arch: x86_64 + cpus: 1 + cpu_cflags: 'sandy bridge' + cores: 14 + memory: 128GB + disks: &disks + - name: 'disk1' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk3' + disk_capacity: 1T + disk_type: ssd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk4' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.21.2 + mac_address: "D0:94:66:58:8C:A8" + interfaces: + # eno1 + - mac_address: "D0:94:66:58:8C:A4" + speed: 1gb + features: '' + name: 'nic1' + # enp5s0f0 + - mac_address: "B4:96:91:31:9D:44" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9D:46" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:58:8C:A5" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:58:8C:A6" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:58:8C:A7" + speed: 1gb + features: '' + name: 'nic6' + ############################################################################ + - name: intel2660-2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.21.3 + mac_address: "D0:94:66:6D:9A:DE" + interfaces: + # eno1 + - mac_address: "D0:94:66:6D:9A:DA" + speed: 1gb + features: '' + name: 'nic1' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:64" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:66" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:6D:9A:DB" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:6D:9A:DC" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:6D:9A:DD" + speed: 1gb + features: '' + name: 'nic6' + ############################################################################ + - name: intel2660-3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.21.4 + mac_address: "D0:94:66:58:9E:DF" + interfaces: + # eno1 + - mac_address: "D0:94:66:58:9E:DB" + speed: 1gb + features: '' + name: 'nic1' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:9C" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:9E" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:58:9E:DC" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:58:9E:DD" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:58:9E:DE" + speed: 1gb + features: '' + name: 'nic6' + ############################################################################ + - name: cn8890-14 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + address: 10.0.21.5 + mac_address: "1c:1b:0d:60:ed:9b" + interfaces: + # enP5144s0, Connected, used only for admin/PXE + - mac_address: "68:05:ca:42:cb:e5" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f1, Connected, trunk for all other VLANs + - mac_address: "1c:1b:0d:60:ed:96" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f2, private + - mac_address: "1c:1b:0d:60:ed:97" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "1c:1b:0d:60:ed:98" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f4, Not connected + - mac_address: "1c:1b:0d:60:ed:99" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f5, Not connected + - mac_address: "1c:1b:0d:60:ed:9a" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic4' + + ############################################################################ + - name: cn8890-15 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + address: 10.0.21.6 + mac_address: "1c:1b:0d:60:ed:b7" + interfaces: + # enP5p144s0 + - mac_address: "68:05:ca:42:cb:e8" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f1 + - mac_address: "1c:1b:0d:60:ed:b2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f2 + - mac_address: "1c:1b:0d:60:ed:b3" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "1c:1b:0d:60:ed:b4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f4, Not connected + - mac_address: "1c:1b:0d:60:ed:b5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enP2p1s0f5, Not connected + - mac_address: "1c:1b:0d:60:ed:b6" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml index 3a55678e..35d46017 100644 --- a/labs/arm/pod5.yaml +++ b/labs/arm/pod5.yaml @@ -156,6 +156,14 @@ nodes: speed: 10gb features: '' name: 'nic2' + - mac_address: "ac:1f:6b:8a:82:84" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "ac:1f:6b:8a:82:85" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' ############################################################################ - name: softiron-7 node: *nodeparams @@ -173,3 +181,11 @@ nodes: speed: 10gb features: '' name: 'nic2' + - mac_address: "ac:1f:6b:8a:82:a0" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "ac:1f:6b:8a:82:a1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' diff --git a/labs/arm/virtual2.yaml b/labs/arm/virtual2.yaml index 3c2b3b10..f19a5de6 100644 --- a/labs/arm/virtual2.yaml +++ b/labs/arm/virtual2.yaml @@ -33,7 +33,7 @@ jumphost: disk_capacity: 500G disk_type: hdd disk_interface: sata - disk_rotation: 7200 + disk_rotation: &diskrotation 7200 os: ubuntu-16.04 remote_params: &remote_params type: ipmi @@ -92,22 +92,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -126,12 +126,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml index bd810193..00b6d126 100644 --- a/labs/bii/idf-pod1.yaml +++ b/labs/bii/idf-pod1.yaml @@ -18,6 +18,7 @@ idf: interface: 0 ip-range: 192.168.20.200-192.168.20.205 vlan: native + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 26dd4f66..c08016b2 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: 172.16.1.16-172.16.1.21 vlan: native + mask: 29 admin: interface: 4 vlan: native diff --git a/labs/ericsson/idf-pod2.yaml b/labs/ericsson/idf-pod2.yaml index 5e0db5af..301241b6 100644 --- a/labs/ericsson/idf-pod2.yaml +++ b/labs/ericsson/idf-pod2.yaml @@ -6,7 +6,127 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- +### ERICSSON POD 2 installer descriptor file ### idf: version: 0.1 - # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy'] + installer: ['apex', 'compass4nfv', 'daisy', 'osa'] + net_config: &net_config + admin: + interface: 2 + network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 + storage: + interface: 3 + network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki + mask: 22 + private: + interface: 4 + network: 172.29.242.0 # Tagged, not the same with 'private' on wiki + mask: 22 + public: + interface: 2 + network: 192.168.122.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 192.168.122.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: admin + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno49' + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + kubespray: &idf_kubespray + nodes_roles: + opnvf: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + + +xci: + pod_name: pod1 + net_config: *net_config + flavors: + mini: + - opnfv + - node1 + - node2 + noha: + - opnfv + - node1 + - node2 + - node3 + ha: + - opnfv + - node1 + - node2 + - node3 + - node4 + - node5 + + # net_config network to be used by the PXE + pxe_network: public + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: virbr0 + ip: 192.168.122.1 + + extra_addresses: + opnfv: 192.168.122.2 + + installers: + osa: *idf_osa + kubespray: *idf_kubespray diff --git a/labs/ericsson/idf-virtual-pod1bl01.yaml b/labs/ericsson/idf-virtual-pod1bl01.yaml index 7e0d2c68..62db57d4 100644 --- a/labs/ericsson/idf-virtual-pod1bl01.yaml +++ b/labs/ericsson/idf-virtual-pod1bl01.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/idf-virtual1.yaml b/labs/ericsson/idf-virtual1.yaml index f234ba06..2a997c38 100644 --- a/labs/ericsson/idf-virtual1.yaml +++ b/labs/ericsson/idf-virtual1.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/idf-virtual2.yaml b/labs/ericsson/idf-virtual2.yaml index b372ccd9..1b200778 100644 --- a/labs/ericsson/idf-virtual2.yaml +++ b/labs/ericsson/idf-virtual2.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/idf-virtual3.yaml b/labs/ericsson/idf-virtual3.yaml index 0b0e67c6..86d7b3b0 100644 --- a/labs/ericsson/idf-virtual3.yaml +++ b/labs/ericsson/idf-virtual3.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/idf-virtual4.yaml b/labs/ericsson/idf-virtual4.yaml index e6ae070d..6d93173b 100644 --- a/labs/ericsson/idf-virtual4.yaml +++ b/labs/ericsson/idf-virtual4.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/idf-virtual5.yaml b/labs/ericsson/idf-virtual5.yaml index beaaaa3f..3d6a366a 100644 --- a/labs/ericsson/idf-virtual5.yaml +++ b/labs/ericsson/idf-virtual5.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: ~ vlan: native + mask: 24 # All networks (except OOB) are virtual networks managed by `libvirt` # Interface indexes are based on Fuel installer defaults admin: @@ -57,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: @@ -86,13 +88,13 @@ idf: - compute_params: &compute_params common: &compute_params_common compute_hugepages_size: 2M - compute_hugepages_count: 2048 + compute_hugepages_count: 5120 compute_hugepages_mount: /mnt/hugepages_2M dpdk: <<: *compute_params_common compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" - compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_socket_mem: "3072" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" dpdk0_driver: igb_uio diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index c0aef2c2..5131ff95 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -55,156 +55,232 @@ jumphost: SKM7gBBWbUmwjBdGX6aurCiyVGv2] remote_management: <<: *remoteparas - address: 172.16.2.11/24 + address: 172.16.2.11 mac_address: "58:20:B1:01:8A:F2" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + address: "192.168.122.2" + mac_address: "ec:b1:d7:a1:a1:10" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: 100.64.201.5/24 + address: "172.29.236.10" mac_address: "5c:b9:01:8b:9f:e8" - vlan: 84 + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: 100.64.201.5/24 + address: "192.168.122.2" mac_address: "5c:b9:01:8b:9f:e9" vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 172.16.0.248/16 + address: "172.29.240.10" mac_address: "5c:b9:01:8b:9f:ec" - vlan: native + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 172.16.0.248/16 + address: "172.29.242.10" mac_address: "5c:b9:01:8b:9f:ed" - vlan: native + vlan: 3010 ############################################################################## nodes: - - name: CI-ERICSSON-POD2-NODE1 + - name: node1 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.12/24 + address: 172.16.2.12 mac_address: "58:20:B1:01:8B:F0" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:a0" + address: "192.168.122.3" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:94" + address: "172.29.236.11" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:95" + address: "192.168.122.3" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:80" + address: "172.29.240.11" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:81" + address: "172.29.242.11" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE2 + - name: node2 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.13/24 + address: 172.16.2.13 mac_address: "58:20:B1:01:8E:FC" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:80" + address: "192.168.122.4" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:30" + address: "172.29.236.12" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:31" + address: "192.168.122.4" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:99:64" + address: "172.29.240.12" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:99:65" # second port, no connection + mac_address: "5c:b9:01:8b:99:65" + address: "172.29.242.12" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE3 + - name: node3 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.14/24 + address: 172.16.2.14 mac_address: "58:20:B1:01:8D:32" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:43:c0" + address: "192.168.122.5" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:4c" + address: "172.29.236.13" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:4d" + address: "192.168.122.5" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:6c" + address: "172.29.240.13" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:6d" + address: "172.29.242.13" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE4 + - name: node4 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.15/24 + address: 172.16.2.15 mac_address: "58:20:B1:01:8B:FC" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:8b:d0" + address: "192.168.122.6" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a5:fc" + address: "172.29.236.14" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a5:fd" + address: "192.168.122.6" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:08" + address: "172.29.240.14" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:09" + address: "172.29.242.14" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE5 + - name: node5 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.16/24 + address: 172.16.2.16 mac_address: "58:20:B1:01:8F:EA" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:bd:60" + address: "192.168.122.7" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:e8" + address: "172.29.236.15" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:e9" + address: "192.168.122.7" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:97:14" + address: "172.29.240.15" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:97:15" + address: "172.29.242.15" + vlan: 3010 diff --git a/labs/ericsson/virtual-pod1bl01.yaml b/labs/ericsson/virtual-pod1bl01.yaml index 9edebee4..e565d54e 100644 --- a/labs/ericsson/virtual-pod1bl01.yaml +++ b/labs/ericsson/virtual-pod1bl01.yaml @@ -100,7 +100,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -115,22 +115,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -149,12 +149,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/ericsson/virtual1.yaml b/labs/ericsson/virtual1.yaml index c19d9c79..57f855bc 100644 --- a/labs/ericsson/virtual1.yaml +++ b/labs/ericsson/virtual1.yaml @@ -100,7 +100,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -115,22 +115,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -149,12 +149,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/ericsson/virtual2.yaml b/labs/ericsson/virtual2.yaml index 7298b78c..cab58ee4 100644 --- a/labs/ericsson/virtual2.yaml +++ b/labs/ericsson/virtual2.yaml @@ -100,7 +100,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -115,22 +115,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -149,12 +149,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/ericsson/virtual3.yaml b/labs/ericsson/virtual3.yaml index 33f2e09f..d4011712 100644 --- a/labs/ericsson/virtual3.yaml +++ b/labs/ericsson/virtual3.yaml @@ -100,7 +100,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -115,22 +115,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -149,12 +149,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/ericsson/virtual4.yaml b/labs/ericsson/virtual4.yaml index cbf50f08..effa8610 100644 --- a/labs/ericsson/virtual4.yaml +++ b/labs/ericsson/virtual4.yaml @@ -100,7 +100,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -115,22 +115,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -149,12 +149,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces diff --git a/labs/ericsson/virtual5.yaml b/labs/ericsson/virtual5.yaml index 48260449..b49d6e87 100644 --- a/labs/ericsson/virtual5.yaml +++ b/labs/ericsson/virtual5.yaml @@ -92,7 +92,7 @@ nodes: vendor: libvirt model: virt cpus: 1 - cores: 8 + cores: 4 memory: 6G disks: &disks - name: 'disk1' @@ -107,22 +107,22 @@ nodes: address: 'qemu:///system' interfaces: &interfaces - name: 'nic1' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt vlan: native - name: 'nic2' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic3' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native - name: 'nic4' - speed: 10gb + speed: 1gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" vlan: native @@ -141,13 +141,22 @@ nodes: ############################################################################ - name: node-4 node: *nodeparams - disks: *disks + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - name: node-5 node: *nodeparams - disks: *disks + disks: *compute_disks remote_management: *remotemgmt interfaces: *interfaces -############################################################################## diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml index 5adf23d4..e219e3b9 100644 --- a/labs/intel/idf-pod18.yaml +++ b/labs/intel/idf-pod18.yaml @@ -8,42 +8,96 @@ --- idf: version: 0.1 - installer: ['joid'] + installer: ['joid', 'fuel'] net_config: # NOTE: Network names are likely to change after the PDF spec is updated oob: interface: 0 - ip-range: - vlan: + ip-range: 10.10.180.10-10.10.180.15 + vlan: native + mask: 24 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 + vlan: 184 + network: 10.10.184.0 + ip-range: 10.10.184.10-10.10.184.254 mask: 24 storage: # storage interface: 3 - vlan: - network: 10.10.182.0 + vlan: native + network: 10.10.183.0 mask: 24 private: # floating - interface: - vlan: - network: 10.10.180.0 + interface: 2 + vlan: 1000-1030 + network: 10.10.182.0 mask: 24 bridge: brExt public: # public - interface: + interface: 3 vlan: 1183 network: 10.10.185.0 + ip-range: 10.10.185.100-10.10.185.253 mask: 24 gateway: 10.10.185.1 dns: - 8.8.8.8 - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'brAdm' + mgmt: 'mgmt18_br0' + private: ~ + public: 'brExt' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + 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 + - 'eno1' + - 'eno2' + - 'ens785f0' + - 'ens785f1' + - 'ens785f2' + - 'ens785f3' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:03:00.0' + - '0000:03:00.3' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:05:00.2' + - '0000:05:00.3' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: + - 'eno1' + - 'enp3s0f3' + - 'ens785f0' + - 'ens785f1' + - 'ens785f2' + - 'ens785f3' + busaddr: + - '0000:03:00.0' + - '0000:03:00.3' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:05:00.2' + - '0000:05:00.3' diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml index 088ef358..73ab232d 100644 --- a/labs/intel/pod18.yaml +++ b/labs/intel/pod18.yaml @@ -51,9 +51,13 @@ jumphost: mac_address: "A4:BF:01:16:31:96" vlan: native - name: 'nic2' - address: 10.10.181.20 + address: 10.10.182.20 mac_address: "A4:BF:01:16:31:97" vlan: native + - name: 'nic3' + address: 10.10.181.20 + mac_address: "3c:fd:fe:a4:9c:f1" + vlan: native nodes: - name: pod18-node1 node: &nodeparas @@ -92,7 +96,7 @@ nodes: features: address: 10.10.181.21 mac_address: "A4:BF:01:14:40:17" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' @@ -136,7 +140,7 @@ nodes: features: address: 10.10.181.22 mac_address: "A4:BF:01:16:31:1F" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' @@ -180,7 +184,7 @@ nodes: features: address: 10.10.181.23 mac_address: "A4:BF:01:16:30:F7" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' @@ -224,7 +228,7 @@ nodes: features: address: 10.10.181.24 mac_address: "A4:BF:01:14:72:0E" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' @@ -268,7 +272,7 @@ nodes: features: address: 10.10.181.25 mac_address: "A4:BF:01:14:71:69" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' diff --git a/labs/itri/idf-pod1.yaml b/labs/itri/idf-pod1.yaml new file mode 100644 index 00000000..f88a913f --- /dev/null +++ b/labs/itri/idf-pod1.yaml @@ -0,0 +1,92 @@ +############################################################################## +# Copyright (c) 2019 ITRI. +# 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 +############################################################################## +--- +### ITRI POD 1 installer descriptor file ### + +idf: + version: 0.1 + installer: ['compass4nfv', 'fuel'] + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + admin: + interface: 0 + vlan: native + network: 10.1.0.0 + mask: 24 + storage: + interface: 1 + vlan: native + network: 172.16.2.0 + mask: 24 + oob: + interface: 1 + ip-range: 100.86.5.28-100.86.5.33 + vlan: native + public: + interface: 2 + vlan: native + network: 100.86.0.0 + mask: 16 + gateway: 100.86.0.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + mgmt: + interface: 4 + vlan: 1001 + network: 172.16.3.0 + mask: 24 + private: + interface: 3 + vlan: 100 + network: 172.16.1.0 + mask: 24 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-ctl' + private: '' + public: '' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eth0' + - 'eth1' + - 'eth2' + - 'eth3' + - 'eth4' + busaddr: + # Bus-info reported by `ethtool -i ethX` + - '0000:03:00.0' + - '0000:05:00.3' + - '0000:02:00.1' + - '0000:05:00.0' + - '0000:02:00.0' + - interfaces: &interfaces + - 'eth0' + - 'eth1' + - 'eth2' + - 'eth3' + - 'eth4' + busaddr: &busaddr + - '0000:03:00.0' + - '0000:04:00.1' + - '0000:02:00.1' + - '0000:05:00.1' + - '0000:02:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/itri/pod1.yaml b/labs/itri/pod1.yaml new file mode 100644 index 00000000..06140900 --- /dev/null +++ b/labs/itri/pod1.yaml @@ -0,0 +1,295 @@ +############################################################################## +# Copyright (c) 2018 ITRI, 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 +############################################################################## +--- +### ITRI POD 1 descriptor file ### + +version: 1.0 +details: + pod_owner: ITRI + contact: mhhsu@itri.org.tw + lab: ITRI Pharos Lab + location: Taiwan + type: production + link: https://wiki.opnfv.org/display/pharos/Community+Labs +############################################################################## +jumphost: + name: pod1-jump + node: + type: baremetal + vendor: Dell + model: PowerEdge R730 + arch: x86_64 + cpus: 2 + cpu_cflags: Broadwell + cores: 24 + memory: 64G + disks: &disks + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk3' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk4' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk5' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk6' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk7' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk8' + 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: 100.86.5.23 + mac_address: "10:98:36:b5:6f:79" + interfaces: + - mac_address: "52:54:00:7c:d6:b4" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.1 + name: 'nic1' +############################################################################## +nodes: + - name: pod1-node1 + node: &nodeparams + type: baremetal + vendor: Dell + model: PowerEdge R730 + arch: x86_64 + cpus: 2 + cpu_cflags: Broadwell + cores: 24 + memory: 128G + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.28 + mac_address: "18:66:da:a3:f0:99" + interfaces: + - mac_address: "18:66:da:a3:f0:97" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.50 + name: 'nic1' + - mac_address: "3c:fd:fe:12:29:c6" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.1 + name: 'nic2' + - mac_address: "18:66:da:a3:f0:96" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.10 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:c0" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.1 + name: 'nic4' + - mac_address: "18:66:da:a3:f0:95" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.29 + mac_address: "18:66:da:a3:f3:c9" + interfaces: + - mac_address: "18:66:da:a3:f3:c7" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.51 + name: 'nic1' + - mac_address: "3c:fd:fe:1a:e0:02" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.2 + name: 'nic2' + - mac_address: "18:66:da:a3:f3:c6" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.11 + name: 'nic3' + - mac_address: "3c:fd:fe:12:09:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.2 + name: 'nic4' + - mac_address: "18:66:da:a3:f3:c5" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.30 + mac_address: "18:66:da:a3:c2:c6" + interfaces: + - mac_address: "18:66:da:a3:c2:c4" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.52 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:23:62" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.3 + name: 'nic2' + - mac_address: "18:66:da:a3:c2:c3" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.12 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.3 + name: 'nic4' + - mac_address: "18:66:da:a3:c2:c2" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.31 + mac_address: "18:66:da:a3:bd:dd" + interfaces: + - mac_address: "18:66:da:a3:bd:db" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.53 + name: 'nic1' + - mac_address: "3c:fd:fe:1a:c6:c2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.4 + name: 'nic2' + - mac_address: "18:66:da:a3:bd:da" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.13 + name: 'nic3' + - mac_address: "3c:fd:fe:12:2b:22" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.4 + name: 'nic4' + - mac_address: "18:66:da:a3:bd:d9" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.32 + mac_address: "18:66:da:a3:b9:8e" + interfaces: + - mac_address: "18:66:da:a3:b9:8c" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.54 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:22:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.5 + name: 'nic2' + - mac_address: "18:66:da:a3:b9:8b" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.14 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:a2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.5 + name: 'nic4' + - mac_address: "18:66:da:a3:b9:8a" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node6 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.33 + mac_address: "18:66:da:a3:c7:5b" + interfaces: + - mac_address: "18:66:da:a3:c7:59" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.55 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:00:82" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.6 + name: 'nic2' + - mac_address: "18:66:da:a3:c7:58" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.15 + name: 'nic3' + - mac_address: "3c:fd:fe:12:2a:c2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.6 + name: 'nic4' + - mac_address: "18:66:da:a3:c7:57" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml index 15f81e6e..b54e2ce7 100644 --- a/labs/lf/idf-pod2.yaml +++ b/labs/lf/idf-pod2.yaml @@ -17,6 +17,7 @@ idf: interface: 0 ip-range: 172.30.8.65-172.30.8.75 vlan: 410 + mask: 26 admin: interface: 0 vlan: native diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml index 69fd1711..c0a1b17e 100644 --- a/labs/lf/idf-pod4.yaml +++ b/labs/lf/idf-pod4.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: 172.30.8.83-172.30.8.88 vlan: 410 + mask: 29 admin: interface: 0 vlan: native @@ -48,6 +49,43 @@ idf: - 8.8.8.8 - 8.8.4.4 osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3.450' + - 'eno3.452' + - 'eno4.451' + - 'eno4.414' fuel: jumphost: bridges: diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml index 6907f02c..01778907 100644 --- a/labs/lf/idf-pod5.yaml +++ b/labs/lf/idf-pod5.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: 172.30.8.89-172.30.8.94 vlan: 410 + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/unh/idf-pod1.yaml b/labs/unh/idf-pod1.yaml index 4583d0c4..e8a57f0d 100644 --- a/labs/unh/idf-pod1.yaml +++ b/labs/unh/idf-pod1.yaml @@ -15,6 +15,7 @@ idf: oob: ip-range: 10.10.52.10-10.10.52.15 vlan: native + mask: 29 admin: interface: 0 vlan: native @@ -55,8 +56,8 @@ idf: public: 'public1_br0' maas: # MaaS timeouts (in minutes) - timeout_comissioning: 10 - timeout_deploying: 15 + timeout_comissioning: 15 + timeout_deploying: 25 network: ntp_strata_host1: 1.pool.ntp.org ntp_strata_host2: 0.pool.ntp.org diff --git a/labs/unh/idf-virtual1.yaml b/labs/unh/idf-virtual1.yaml new file mode 100644 index 00000000..0ab8353a --- /dev/null +++ b/labs/unh/idf-virtual1.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### unh-virtual1 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + 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 + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/unh/virtual1.yaml b/labs/unh/virtual1.yaml new file mode 100644 index 00000000..8dc2edda --- /dev/null +++ b/labs/unh/virtual1.yaml @@ -0,0 +1,164 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### unh-virtual1 POD descriptor file ### + +version: 1.0 +details: + pod_owner: University of New Hampshire + contact: lincoln.lavoie@iol.unh.edu + lab: UNH lab + location: New Hampshire, USA + type: development + link: https://wiki.opnfv.org/display/INF/Lab+as+a+Service+2.0 +############################################################################## +jumphost: + name: unh-virtual1 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 22 + memory: 512G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: changeme + pass: changeme + remote_management: + <<: *remoteparas + address: 0.0.0.0/24 + mac_address: "00:00:00:00:00:00" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.202.5/24 + mac_address: "00:00:00:00:00:00" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 14G + disks: + - name: 'disk1' + disk_capacity: 400G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: &diskrotation 0 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 1 + cores: 4 + memory: 8G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 1 + cores: 4 + memory: 8G + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: &compute_nodeparams + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 2 + cores: 18 + memory: 120G + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *compute_nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml index fd05e662..ff7ad820 100644 --- a/labs/zte/idf-pod1.yaml +++ b/labs/zte/idf-pod1.yaml @@ -16,6 +16,7 @@ idf: interface: 0 ip-range: 192.168.1.101-192.168.1.105 vlan: null + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml index 0d8d7f67..2bae8a12 100644 --- a/labs/zte/idf-pod2.yaml +++ b/labs/zte/idf-pod2.yaml @@ -17,6 +17,7 @@ idf: interface: 0 ip-range: 192.168.1.106-192.168.1.110 vlan: null + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml index 116bac59..25b061a6 100644 --- a/labs/zte/idf-pod3.yaml +++ b/labs/zte/idf-pod3.yaml @@ -17,6 +17,7 @@ idf: interface: 0 ip-range: 192.168.1.32-192.168.1.36 vlan: null + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/zte/idf-pod9.yaml b/labs/zte/idf-pod9.yaml index 1cdd5d88..a6c7dfa6 100644 --- a/labs/zte/idf-pod9.yaml +++ b/labs/zte/idf-pod9.yaml @@ -18,6 +18,7 @@ idf: interface: 0 ip-range: 192.168.176.166-192.168.176.168 vlan: null + mask: 29 admin: interface: 0 vlan: null diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..8898266c --- /dev/null +++ b/tox.ini @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation 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 +############################################################################## +[tox] +minversion = 1.6 +envlist = + docs, + docs-linkcheck +skipsdist = true + +[testenv:docs] +deps = -rdocs/requirements.txt +commands = + sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + echo "Generated docs available in {toxinidir}/docs/_build/html" +whitelist_externals = echo + +[testenv:docs-linkcheck] +deps = -rdocs/requirements.txt +commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck |