diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-13 22:39:06 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-19 01:02:15 +0000 |
| commit | af0677e46c543e113fce4113bac47bdda27c82ff (patch) | |
| tree | 737d149031c35e7f5c11826bba9cefce25edc85c /deploy | |
| parent | 2ba9e1ad00f3ee22f9ae8d77e863a8915ff05cc0 (diff) | |
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 <jonas.bjurel@ericsson.com>
(cherry picked from commit bc8d77ae064f1e6ed910edaf37a0c27beed33026)
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/scenario/scenario.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
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-<controller>-<feature>-<mode>[-<optional-parameter>] +# 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 |