summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 14:53:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-07 14:53:05 +0000
commit0f1bef52ce8e7040934ec16894b266579bb82c58 (patch)
tree9dc59459d3d63bd41cb354e014a000f0b5f4d54a
parente8b0ec175eb68c792c7da3d225214c8b1874f42d (diff)
parent86c8109641cf22548ca68876e7de89b0d13e96b5 (diff)
Merge "[hybrid] Merge config/scenario/{baremetal,virtual}"
-rwxr-xr-xci/deploy.sh8
-rw-r--r--mcp/config/scenario/.gitignore1
-rw-r--r--mcp/config/scenario/README.rst2
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml25
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-ha.yaml (renamed from mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml)0
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml)0
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 (renamed from mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml)26
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-ha.yaml (renamed from mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml)0
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml (renamed from mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml)0
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml (renamed from mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml)0
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml)0
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml)0
-rw-r--r--mcp/scripts/requirements_deb.yaml2
-rw-r--r--mcp/scripts/requirements_rpm.yaml2
14 files changed, 31 insertions, 35 deletions
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-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-nofeature-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml
index 547bc2972..547bc2972 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
index b35e66fc7..b35e66fc7 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
index 69d407b82..58f418622 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
@@ -5,20 +5,46 @@
# 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
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml
index a7ecba7fc..a7ecba7fc 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index e3cd3dbd9..e3cd3dbd9 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml
index 7cf1033a4..7cf1033a4 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index cef41270c..cef41270c 100644
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
diff --git a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index e0a19ebb2..e0a19ebb2 100644
--- a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
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)