From 01c1d38d26c176fa842d1061bfdc2d94cbf3b75e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 1 Aug 2017 22:06:11 +0200 Subject: mcp/config: Move scenario defs to separate dir Prepare for adding baremetal scenarios by moving existing scenario definitions (intended for deploys on virtual PODs) to their own subdirectory. Change-Id: Iaa75e0b0a9876e4f263fc6bbae796d97848ef99b Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 10 +++++++--- mcp/config/defaults.yaml | 6 ------ mcp/config/os-nosdn-nofeature-noha.yaml | 18 ----------------- mcp/config/os-nosdn-ovs-noha.yaml | 23 ---------------------- mcp/config/os-odl_l2-nofeature-noha.yaml | 22 --------------------- mcp/config/os-odl_l3-nofeature-noha.yaml | 22 --------------------- mcp/config/scenario/README.md | 22 +++++++++++++++++++++ mcp/config/scenario/baremetal/.gitkeep | 0 mcp/config/scenario/virtual/.gitkeep | 0 mcp/config/scenario/virtual/defaults.yaml | 6 ++++++ .../scenario/virtual/os-nosdn-nofeature-noha.yaml | 18 +++++++++++++++++ mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml | 23 ++++++++++++++++++++++ .../scenario/virtual/os-odl_l2-nofeature-noha.yaml | 22 +++++++++++++++++++++ .../scenario/virtual/os-odl_l3-nofeature-noha.yaml | 22 +++++++++++++++++++++ 14 files changed, 120 insertions(+), 94 deletions(-) delete mode 100644 mcp/config/defaults.yaml delete mode 100644 mcp/config/os-nosdn-nofeature-noha.yaml delete mode 100644 mcp/config/os-nosdn-ovs-noha.yaml delete mode 100644 mcp/config/os-odl_l2-nofeature-noha.yaml delete mode 100644 mcp/config/os-odl_l3-nofeature-noha.yaml create mode 100644 mcp/config/scenario/README.md create mode 100644 mcp/config/scenario/baremetal/.gitkeep create mode 100644 mcp/config/scenario/virtual/.gitkeep create mode 100644 mcp/config/scenario/virtual/defaults.yaml create mode 100644 mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml create mode 100644 mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml create mode 100644 mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml create mode 100644 mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml diff --git a/ci/deploy.sh b/ci/deploy.sh index a77dd0f88..5886a85ce 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -129,6 +129,7 @@ clean() { # SCRIPT_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") DEPLOY_DIR=$(cd "${SCRIPT_PATH}/../mcp/scripts"; pwd) +DEPLOY_TYPE='baremetal' OPNFV_BRIDGES=('pxe' 'mgmt' 'internal' 'public') URI_REGEXP='(file|https?|ftp)://.*' @@ -206,6 +207,9 @@ do ;; p) TARGET_POD=${OPTARG} + if [[ "${TARGET_POD}" =~ "virtual" ]]; then + DEPLOY_TYPE='virtual' + fi ;; s) DEPLOY_SCENARIO=${OPTARG} @@ -275,7 +279,7 @@ pushd "${DEPLOY_DIR}" > /dev/null git make rsync genisoimage curl virt-install qemu-kvm # Check scenario file existence -if [[ ! -f ../config/${DEPLOY_SCENARIO}.yaml ]]; then +if [[ ! -f ../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml ]]; then notify "[WARN] ${DEPLOY_SCENARIO}.yaml not found! \ Setting simplest scenario (os-nosdn-nofeature-noha)\n" 3 DEPLOY_SCENARIO='os-nosdn-nofeature-noha' @@ -283,8 +287,8 @@ fi # Get required infra deployment data source lib.sh -eval "$(parse_yaml "../config/defaults.yaml")" -eval "$(parse_yaml "../config/${DEPLOY_SCENARIO}.yaml")" +eval "$(parse_yaml "../config/scenario/${DEPLOY_TYPE}/defaults.yaml")" +eval "$(parse_yaml "../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" export CLUSTER_DOMAIN=${cluster_domain} diff --git a/mcp/config/defaults.yaml b/mcp/config/defaults.yaml deleted file mode 100644 index b841e88c9..000000000 --- a/mcp/config/defaults.yaml +++ /dev/null @@ -1,6 +0,0 @@ -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -virtual: - default: - vcpus: 2 - ram: 4096 - diff --git a/mcp/config/os-nosdn-nofeature-noha.yaml b/mcp/config/os-nosdn-nofeature-noha.yaml deleted file mode 100644 index 7208d89f2..000000000 --- a/mcp/config/os-nosdn-nofeature-noha.yaml +++ /dev/null @@ -1,18 +0,0 @@ -cluster: - domain: virtual-mcp-ocata-ovs.local - states: - - openstack - - neutron_compute - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - - gtw01 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 diff --git a/mcp/config/os-nosdn-ovs-noha.yaml b/mcp/config/os-nosdn-ovs-noha.yaml deleted file mode 100644 index ab882215b..000000000 --- a/mcp/config/os-nosdn-ovs-noha.yaml +++ /dev/null @@ -1,23 +0,0 @@ -cluster: - domain: virtual-mcp-ocata-ovs-dpdk.local - states: - - dpdk - - openstack - - neutron_compute - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - - gtw01 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - cmp01: - ram: 6144 - cmp02: - ram: 6144 diff --git a/mcp/config/os-odl_l2-nofeature-noha.yaml b/mcp/config/os-odl_l2-nofeature-noha.yaml deleted file mode 100644 index feb78c93a..000000000 --- a/mcp/config/os-odl_l2-nofeature-noha.yaml +++ /dev/null @@ -1,22 +0,0 @@ -cluster: - domain: virtual-mcp-ocata-odl.local - states: - - opendaylight - - openstack - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - - gtw01 - - odl01 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - odl01: - vcpus: 4 - ram: 5120 diff --git a/mcp/config/os-odl_l3-nofeature-noha.yaml b/mcp/config/os-odl_l3-nofeature-noha.yaml deleted file mode 100644 index de95e503d..000000000 --- a/mcp/config/os-odl_l3-nofeature-noha.yaml +++ /dev/null @@ -1,22 +0,0 @@ -cluster: - domain: virtual-mcp-ocata-odl-router.local - states: - - opendaylight - - openstack - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - - gtw01 - - odl01 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - odl01: - vcpus: 4 - ram: 5120 diff --git a/mcp/config/scenario/README.md b/mcp/config/scenario/README.md new file mode 100644 index 000000000..6ecf05f32 --- /dev/null +++ b/mcp/config/scenario/README.md @@ -0,0 +1,22 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +Abstract: +--------- +This directory contains configuration files for different OPNFV deployment +feature scenarios used by Fuel@OPNFV, e.g.: +- High availability configuration; +- Type of SDN controller to be deployed; +- OPNFV collaboration project features to be deployed; +- Provisioning of any other sevices; +- POD configuration (baremetal, virtual); + +NOTES: +------ +This directory is highly likely to change and/or be replaced/complemented +by the new PDF (Pod Descriptor File) info in securedlab OPNFV git repo. diff --git a/mcp/config/scenario/baremetal/.gitkeep b/mcp/config/scenario/baremetal/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/mcp/config/scenario/virtual/.gitkeep b/mcp/config/scenario/virtual/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml new file mode 100644 index 000000000..b841e88c9 --- /dev/null +++ b/mcp/config/scenario/virtual/defaults.yaml @@ -0,0 +1,6 @@ +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img +virtual: + default: + vcpus: 2 + ram: 4096 + diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml new file mode 100644 index 000000000..7208d89f2 --- /dev/null +++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml @@ -0,0 +1,18 @@ +cluster: + domain: virtual-mcp-ocata-ovs.local + states: + - openstack + - neutron_compute + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml new file mode 100644 index 000000000..ab882215b --- /dev/null +++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml @@ -0,0 +1,23 @@ +cluster: + domain: virtual-mcp-ocata-ovs-dpdk.local + states: + - dpdk + - openstack + - neutron_compute + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + cmp01: + ram: 6144 + cmp02: + ram: 6144 diff --git a/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml new file mode 100644 index 000000000..feb78c93a --- /dev/null +++ b/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml @@ -0,0 +1,22 @@ +cluster: + domain: virtual-mcp-ocata-odl.local + states: + - opendaylight + - openstack + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + - odl01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + odl01: + vcpus: 4 + ram: 5120 diff --git a/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml new file mode 100644 index 000000000..de95e503d --- /dev/null +++ b/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml @@ -0,0 +1,22 @@ +cluster: + domain: virtual-mcp-ocata-odl-router.local + states: + - opendaylight + - openstack + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + - odl01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + odl01: + vcpus: 4 + ram: 5120 -- cgit 1.2.3-korg