From bc8d77ae064f1e6ed910edaf37a0c27beed33026 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Wed, 13 Jan 2016 22:39:06 +0100 Subject: Temporary fix for ONOS deployment scenario. - Although ONOS supports L3, this patch doesnt let the L3 capabilities of ONOS loose - this is due to OPNFV Pharos lab incompatibilities with ONOS. Hope to have a fix soon - Also provides a template for scenario short names Change-Id: Ie86bcdc23492ee0fd7a19c11eecfca07afb64df3 Signed-off-by: Jonas Bjurel --- deploy/scenario/scenario.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'deploy/scenario/scenario.yaml') diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml index 58f45c7af..abde2e753 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -20,6 +20,14 @@ # is different currently which needs to be aligned as well. ############################################################################## +############################################################################## +# Short scenario name convention to be followed: +# os---[-] +# controler: nosdn|odl|onos|ocl|... +# feaure: nofeature | [vlan]_[kvm]_[ovs]_[vlan]_.... +# mode: ha|noha +############################################################################## + os-nosdn-nofeature-ha: configfile: ha_heat_ceilometer_scenario_0.0.1.yaml @@ -45,10 +53,10 @@ os-odl_l2-nofeature-noha: configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml os-onos-nofeature-ha: - configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml + configfile: ha_onos_heat_ceilometer_scenario_0.0.1.yaml os-onos-nofeature-noha: - configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml + configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml os-nosdn-kvm-ha: configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml -- cgit 1.2.3-korg