From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 1 Aug 2017 20:06:11 +0000 (+0200)
Subject: mcp/config: Move scenario defs to separate dir
X-Git-Tag: opnfv-5.0.RC1~153^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F38553%2F1;p=fuel.git

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 <Alexandru.Avadanii@enea.com>
---

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/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/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml
similarity index 100%
rename from mcp/config/defaults.yaml
rename to mcp/config/scenario/virtual/defaults.yaml
diff --git a/mcp/config/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
similarity index 100%
rename from mcp/config/os-nosdn-nofeature-noha.yaml
rename to mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
diff --git a/mcp/config/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
similarity index 100%
rename from mcp/config/os-nosdn-ovs-noha.yaml
rename to mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
diff --git a/mcp/config/os-odl_l2-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
similarity index 100%
rename from mcp/config/os-odl_l2-nofeature-noha.yaml
rename to mcp/config/scenario/virtual/os-odl_l2-nofeature-noha.yaml
diff --git a/mcp/config/os-odl_l3-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml
similarity index 100%
rename from mcp/config/os-odl_l3-nofeature-noha.yaml
rename to mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml