From 86c8109641cf22548ca68876e7de89b0d13e96b5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 4 Feb 2018 21:16:07 +0100 Subject: [hybrid] Merge config/scenario/{baremetal,virtual} Instead of classifying scenarios by underlying machine type, switch to HA/NOHA differentiantion only. This allows us to add support for hybrid scenarios (with some virtual and some baremetal nodes in the same cluster). To facilitate this, we will template the scenario files, which is a small step towards SDF (Scenario Descriptor File) definition and adoption later. JIRA: FUEL-338 Change-Id: If5787991869a3105d82c27ffa0a86ac79b4b08ba Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 8 ++- mcp/config/scenario/.gitignore | 1 + mcp/config/scenario/README.rst | 2 +- .../scenario/baremetal/os-nosdn-nofeature-ha.yaml | 26 ---------- .../baremetal/os-nosdn-nofeature-novcp-ha.yaml | 25 ---------- mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 28 ----------- .../scenario/baremetal/os-odl-nofeature-ha.yaml | 27 ---------- mcp/config/scenario/os-nosdn-nofeature-ha.yaml | 26 ++++++++++ mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 27 ++++++++++ .../scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 | 57 ++++++++++++++++++++++ mcp/config/scenario/os-nosdn-ovs-ha.yaml | 28 +++++++++++ mcp/config/scenario/os-nosdn-ovs-noha.yaml | 34 +++++++++++++ mcp/config/scenario/os-odl-nofeature-ha.yaml | 27 ++++++++++ mcp/config/scenario/os-odl-nofeature-noha.yaml | 31 ++++++++++++ mcp/config/scenario/os-ovn-nofeature-noha.yaml | 30 ++++++++++++ .../scenario/virtual/os-nosdn-nofeature-noha.yaml | 27 ---------- .../virtual/os-nosdn-nofeature-novcp-ha.yaml | 31 ------------ mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml | 34 ------------- .../scenario/virtual/os-odl-nofeature-noha.yaml | 31 ------------ .../scenario/virtual/os-ovn-nofeature-noha.yaml | 30 ------------ mcp/scripts/requirements_deb.yaml | 2 - mcp/scripts/requirements_rpm.yaml | 2 - 22 files changed, 265 insertions(+), 269 deletions(-) create mode 100644 mcp/config/scenario/.gitignore delete mode 100644 mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml delete mode 100644 mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml delete mode 100644 mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml delete mode 100644 mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml create mode 100644 mcp/config/scenario/os-nosdn-nofeature-ha.yaml create mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml create mode 100644 mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-ovs-ha.yaml create mode 100644 mcp/config/scenario/os-nosdn-ovs-noha.yaml create mode 100644 mcp/config/scenario/os-odl-nofeature-ha.yaml create mode 100644 mcp/config/scenario/os-odl-nofeature-noha.yaml create mode 100644 mcp/config/scenario/os-ovn-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml delete mode 100644 mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml delete mode 100644 mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml diff --git a/ci/deploy.sh b/ci/deploy.sh index 18de570e9..e962ddd1d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -120,7 +120,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x REPO_ROOT_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..") DEPLOY_DIR=$(cd "${REPO_ROOT_PATH}/mcp/scripts"; pwd) STORAGE_DIR=$(cd "${REPO_ROOT_PATH}/mcp/deploy/images"; pwd) -DEPLOY_TYPE='baremetal' BR_NAMES=('admin' 'mgmt' 'private' 'public') OPNFV_BRIDGES=('pxebr' 'mgmt' 'internal' 'public') URI_REGEXP='(file|https?|ftp)://.*' @@ -183,7 +182,6 @@ do p) TARGET_POD=${OPTARG} if [[ "${TARGET_POD}" =~ virtual ]]; then - DEPLOY_TYPE='virtual' # All vPODs will use 'local-virtual1' PDF/IDF for now TARGET_LAB='local' TARGET_POD='virtual1' @@ -244,7 +242,7 @@ else pkg_type='rpm'; pkg_cmd='sudo yum install -y --skip-broken' fi eval "$(parse_yaml "./requirements_${pkg_type}.yaml")" - for section in 'common' "${DEPLOY_TYPE}" "$(uname -m)"; do + for section in 'common' "$(uname -m)"; do section_var="requirements_pkg_${section}[*]" pkg_list+=" ${!section_var}" done @@ -268,7 +266,7 @@ do_templates "${REPO_ROOT_PATH}" "${STORAGE_DIR}" "${TARGET_LAB}" \ "${TARGET_POD}" "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" # Check scenario file existence -if [ ! -f "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then +if [ ! -f "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml" ]; then notify_e "[ERROR] Scenario definition file is missing!" fi @@ -279,7 +277,7 @@ fi # Get scenario data and (jumpserver) arch defaults eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" -eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" +eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml")" export CLUSTER_DOMAIN=${cluster_domain} # Expand jinja2 templates based on PDF data and env vars diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore new file mode 100644 index 000000000..14e9ab880 --- /dev/null +++ b/mcp/config/scenario/.gitignore @@ -0,0 +1 @@ +os-nosdn-nofeature-novcp-ha.yaml diff --git a/mcp/config/scenario/README.rst b/mcp/config/scenario/README.rst index 389877ac4..e03182f11 100644 --- a/mcp/config/scenario/README.rst +++ b/mcp/config/scenario/README.rst @@ -19,4 +19,4 @@ feature scenarios used by Fuel@OPNFV, e.g.: 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. +by the new PDF (Pod Descriptor File) info in Pharos OPNFV git repo. diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml deleted file mode 100644 index 547bc2972..000000000 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: mcp-pike-ovs-ha.local - states: - - maas - - baremetal_init - - virtual_control_plane - - openstack_ha - - networks -virtual: - nodes: - - cfg01 - - mas01 - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml deleted file mode 100644 index 0c5744199..000000000 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: mcp-pike-ovs-novcp-ha.local - states: - - maas - - baremetal_init - - openstack_ha - - networks -virtual: - nodes: - - cfg01 - - mas01 - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml deleted file mode 100644 index a7ecba7fc..000000000 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: mcp-pike-ovs-dpdk-ha.local - states: - - maas - - baremetal_init - - virtual_control_plane - - dpdk - - openstack_ha - - networks - - networking_gw -virtual: - nodes: - - cfg01 - - mas01 - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml deleted file mode 100644 index 7cf1033a4..000000000 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: mcp-pike-odl-ha.local - states: - - maas - - baremetal_init - - virtual_control_plane - - opendaylight - - openstack_ha - - networks -virtual: - nodes: - - cfg01 - - mas01 - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml new file mode 100644 index 000000000..547bc2972 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml @@ -0,0 +1,26 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-pike-ovs-ha.local + states: + - maas + - baremetal_init + - virtual_control_plane + - openstack_ha + - networks +virtual: + nodes: + - cfg01 + - mas01 + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml new file mode 100644 index 000000000..b35e66fc7 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -0,0 +1,27 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: virtual-mcp-pike-ovs-noha.local + states: + - openstack_noha + - neutron_gateway + - neutron_compute + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 new file mode 100644 index 000000000..58f418622 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 @@ -0,0 +1,57 @@ +############################################################################## +# 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 +############################################################################## +{%- import 'net_map.j2' as nm with context %} +{%- for node in conf.nodes %} + {%- if node.node.type == 'baremetal' %} + {%- set cluster_has_baremetal_nodes = True %} + {%- endif %} +{%- endfor %} +--- +cluster: + domain: mcp-pike-ovs-novcp-ha.local + states: +{%- if cluster_has_baremetal_nodes %} + - maas + - baremetal_init +{%- endif %} + - openstack_ha + - networks +virtual: + nodes: + - cfg01 +{%- if cluster_has_baremetal_nodes %} + - mas01 +{%- endif %} +{#- Most likely, controllers will always have the same type and number (3) #} +{%- if conf.nodes[nm.ctl01.idx].node.type == 'virtual' %} + - kvm01 + - kvm02 + - kvm03 +{%- endif %} +{#- Later, we might have mixed computes here, for hybrid multi-arch testing #} +{%- if conf.nodes[nm.cmp001.idx].node.type == 'virtual' %} + - cmp001 + - cmp002 +{%- endif %} + cfg01: + vcpus: 4 + ram: 6144 + # Below values are only used when nodes are defined in virtual.nodes above + mas01: + vcpus: 4 + ram: 6144 + # NOTE: We might need to add more RAM here + kvm01: + vcpus: 4 + ram: 14336 + kvm02: + vcpus: 4 + ram: 14336 + kvm03: + vcpus: 4 + ram: 14336 diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml new file mode 100644 index 000000000..a7ecba7fc --- /dev/null +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml @@ -0,0 +1,28 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-pike-ovs-dpdk-ha.local + states: + - maas + - baremetal_init + - virtual_control_plane + - dpdk + - openstack_ha + - networks + - networking_gw +virtual: + nodes: + - cfg01 + - mas01 + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml new file mode 100644 index 000000000..e3cd3dbd9 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -0,0 +1,34 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: virtual-mcp-pike-ovs-dpdk-noha.local + states: + - dpdk + - openstack_noha + - neutron_gateway + - neutron_compute + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + - gtw01 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + cmp01: + vcpus: 4 + ram: 8192 + cmp02: + vcpus: 4 + ram: 8192 diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml new file mode 100644 index 000000000..7cf1033a4 --- /dev/null +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml @@ -0,0 +1,27 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-pike-odl-ha.local + states: + - maas + - baremetal_init + - virtual_control_plane + - opendaylight + - openstack_ha + - networks +virtual: + nodes: + - cfg01 + - mas01 + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml new file mode 100644 index 000000000..cef41270c --- /dev/null +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -0,0 +1,31 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: virtual-mcp-pike-odl-noha.local + states: + - opendaylight + - openstack_noha + - neutron_gateway + - 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/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml new file mode 100644 index 000000000..e0a19ebb2 --- /dev/null +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -0,0 +1,30 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: virtual-mcp-pike-ovn-noha.local + states: + - openstack_noha + - ovn_ctl_opts + - neutron_compute + - networks +virtual: + nodes: + - cfg01 + - ctl01 + - cmp01 + - cmp02 + ctl01: + vcpus: 4 + ram: 14336 + cmp01: + vcpus: 5 + ram: 8192 + cmp02: + vcpus: 5 + ram: 8192 diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml deleted file mode 100644 index b35e66fc7..000000000 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: virtual-mcp-pike-ovs-noha.local - states: - - openstack_noha - - neutron_gateway - - 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-nofeature-novcp-ha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml deleted file mode 100644 index 69d407b82..000000000 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml +++ /dev/null @@ -1,31 +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 -############################################################################## ---- -cluster: - domain: mcp-pike-ovs-novcp-ha.local - states: - - openstack_ha - - networks -virtual: - nodes: - - cfg01 - - kvm01 - - kvm02 - - kvm03 - - cmp001 - - cmp002 - # NOTE: We might need to add more RAM here - kvm01: - vcpus: 4 - ram: 14336 - kvm02: - vcpus: 4 - ram: 14336 - kvm03: - vcpus: 4 - ram: 14336 diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml deleted file mode 100644 index e3cd3dbd9..000000000 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: virtual-mcp-pike-ovs-dpdk-noha.local - states: - - dpdk - - openstack_noha - - neutron_gateway - - neutron_compute - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - - gtw01 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - cmp01: - vcpus: 4 - ram: 8192 - cmp02: - vcpus: 4 - ram: 8192 diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml deleted file mode 100644 index cef41270c..000000000 --- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: virtual-mcp-pike-odl-noha.local - states: - - opendaylight - - openstack_noha - - neutron_gateway - - 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-ovn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml deleted file mode 100644 index e0a19ebb2..000000000 --- a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -cluster: - domain: virtual-mcp-pike-ovn-noha.local - states: - - openstack_noha - - ovn_ctl_opts - - neutron_compute - - networks -virtual: - nodes: - - cfg01 - - ctl01 - - cmp01 - - cmp02 - ctl01: - vcpus: 4 - ram: 14336 - cmp01: - vcpus: 5 - ram: 8192 - cmp02: - vcpus: 5 - ram: 8192 diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml index bb0d586da..e50a48ff8 100644 --- a/mcp/scripts/requirements_deb.yaml +++ b/mcp/scripts/requirements_deb.yaml @@ -28,8 +28,6 @@ requirements_pkg: - python-ipaddress - python-jinja2 - python-yaml - # Optional, deploy-type-specific requirements - # baremetal: # Optional, arch-specific requirements, matched by key name = $(uname -m) aarch64: # AArch64 VMs use AAVMF (guest UEFI) diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml index d510ba87d..ccb066e76 100644 --- a/mcp/scripts/requirements_rpm.yaml +++ b/mcp/scripts/requirements_rpm.yaml @@ -32,8 +32,6 @@ requirements_pkg: - python-ipaddress - python-jinja2 - python-yaml - # Optional, deploy-type-specific requirements - # baremetal: # Optional, arch-specific requirements, matched by key name = $(uname -m) aarch64: # AArch64 VMs use AAVMF (guest UEFI) -- cgit 1.2.3-korg