10 files changed, 57 insertions, 3 deletions
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
--- /dev/null
+++ b/mcp/config/scenario/baremetal/.gitkeep
diff --git a/mcp/config/scenario/virtual/.gitkeep b/mcp/config/scenario/virtual/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mcp/config/scenario/virtual/.gitkeep
diff --git a/mcp/config/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml
index b841e88c9..b841e88c9 100644
--- a/mcp/config/defaults.yaml
+++ b/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
index 7208d89f2..7208d89f2 100644
--- a/mcp/config/os-nosdn-nofeature-noha.yaml
+++ b/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
index ab882215b..ab882215b 100644
--- a/mcp/config/os-nosdn-ovs-noha.yaml
+++ b/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
index feb78c93a..feb78c93a 100644
--- a/mcp/config/os-odl_l2-nofeature-noha.yaml
+++ b/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
index de95e503d..de95e503d 100644
--- a/mcp/config/os-odl_l3-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl_l3-nofeature-noha.yaml
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
index e25f41742..ba710a36e 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
@@ -46,9 +46,11 @@ parameters:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
       ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
       tunnel_ip: ${_param:tenant_address}
+      provider_mappings: physnet1:br-floating
   linux:
     network:
       bridge: openvswitch
+      gateway: ${_param:openstack_gateway_address}
       interface:
         dhcp_int:
           enabled: true
@@ -68,6 +70,12 @@ parameters:
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
         br-mgmt:
           enabled: true
           type: bridge
@@ -82,5 +90,25 @@ parameters:
           proto: static
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
+          gateway: 10.1.0.110
           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: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex