From 421aa5796c194382bec24737b9b1d60bde544672 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 13 Apr 2018 12:50:14 +0400 Subject: [virtual] Bring in OpenDaylight DPDK scenario Change-Id: If77ac85fa86e0a1a18c0cc2abff77d876cdb9e93 Signed-off-by: Michael Polenchuk --- ci/deploy.sh | 3 +- mcp/config/scenario/os-odl-ovs-noha.yaml | 38 ++++++++++++ .../cluster/mcp-pike-odl-noha/infra/config.yml | 28 --------- .../cluster/mcp-pike-odl-noha/infra/config.yml.j2 | 28 +++++++++ .../mcp-pike-odl-noha/openstack/compute.yml | 50 --------------- .../mcp-pike-odl-noha/openstack/compute.yml.j2 | 72 ++++++++++++++++++++++ 6 files changed, 140 insertions(+), 79 deletions(-) create mode 100644 mcp/config/scenario/os-odl-ovs-noha.yaml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 diff --git a/ci/deploy.sh b/ci/deploy.sh index a5fec4d44..fd41be85d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -266,8 +266,9 @@ fi generate_ssh_key export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" +MCP_DPDK_MODE=$([[ "$DEPLOY_SCENARIO" =~ ovs ]] && echo 1 || echo 0) # Expand jinja2 templates based on PDF data and env vars -export MCP_VCP MCP_JUMP_ARCH=$(uname -i) +export MCP_VCP MCP_DPDK_MODE MCP_JUMP_ARCH=$(uname -i) do_templates_scenario "${STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" do_templates_cluster "${STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml new file mode 100644 index 000000000..c282707f7 --- /dev/null +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +cluster: + domain: mcp-pike-odl-noha.local + states: + - dpdk + - opendaylight + - openstack_noha + - neutron_gateway + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + - odl01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 1024 + odl01: + vcpus: 4 + ram: 5120 + cmp01: + vcpus: 4 + ram: 8192 + cmp02: + vcpus: 4 + ram: 8192 diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml deleted file mode 100644 index b63ac68b5..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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 -############################################################################## ---- -classes: - - system.reclass.storage.system.opendaylight_control_single - - system.reclass.storage.system.openstack_gateway_single - - cluster.mcp-pike-common-noha.infra.config - - cluster.mcp-pike-odl-noha - - cluster.all-mcp-arch-common.infra.config_pdf -parameters: - reclass: - storage: - node: - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control - params: - linux_system_codename: xenial - single_address: ${_param:opendaylight_service_host} - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 new file mode 100644 index 000000000..46e25fe95 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 @@ -0,0 +1,28 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +classes: + - system.reclass.storage.system.opendaylight_control_single + - system.reclass.storage.system.openstack_gateway_single + - cluster.mcp-pike-common-noha.infra.config + - cluster.mcp-pike-odl-noha + - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf +parameters: + reclass: + storage: + node: + opendaylight_control_node01: + classes: + - cluster.${_param:cluster_name}.opendaylight.control + params: + linux_system_codename: xenial + single_address: ${_param:opendaylight_service_host} + openstack_gateway_node01: + params: + tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml deleted file mode 100644 index b0690167f..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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 -############################################################################## ---- -classes: - - service.neutron.compute.single - - service.neutron.compute.opendaylight.single - - cluster.mcp-pike-common-noha.openstack_compute - - cluster.mcp-pike-odl-noha -parameters: - linux: - network: - interface: - external_interface: - enabled: true - type: eth - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: ${_param:opnfv_net_public_mask} - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 new file mode 100644 index 000000000..12dfdcaa1 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 @@ -0,0 +1,72 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +classes: + - service.neutron.compute.single + - service.neutron.compute.opendaylight.single +{%- if conf.MCP_DPDK_MODE %} + - system.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk +{%- endif %} + - cluster.mcp-pike-common-noha.openstack_compute + - cluster.mcp-pike-odl-noha +parameters: + linux: + network: + interface: +{%- if conf.MCP_DPDK_MODE %} + dpdk0: + name: ${_param:dpdk0_name} + pci: ${_param:dpdk0_pci} + driver: ${_param:dpdk0_driver} + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: ${_param:dpdk0_n_rxq} + br-prv: + enabled: true + type: dpdk_ovs_bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + tenant_interface: + type: dpdk # Not a meaningful type, just match 'dpdk' for filtering +{%- endif %} + external_interface: + enabled: true + type: eth + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + br-mesh: + enabled: true + type: bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex -- cgit 1.2.3-korg