From cefa3fdadc8c1bd6d8b92c5976f76dbbebc87992 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sun, 10 Jan 2016 19:31:52 +0100 Subject: ONOS scenario according to wanted config file structure Replaces: - https://gerrit.opnfv.org/gerrit/#/c/5999/ - https://gerrit.opnfv.org/gerrit/#/c/6003/ Description: - Onos scenarios updated with needed dea and dha overrides, no scenario specific information in other config files such dha, dea_base, dea_pod override, etc. - Added a virtual POD for Huawei-china specific needs, i.e. DNS and NTP. - Small fix in deploy-conf.py Change-Id: I85fe2fc4e9ec5fe0bc98ae7b399f2e49af6450f9 Signed-off-by: Jonas Bjurel (cherry picked from commit 283bf98d087afd9073632340800e745f5a8d8de2) --- deploy/scenario/scenario.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'deploy/scenario/scenario.yaml') diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml index e978a46d0..1d75b2353 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -32,10 +32,10 @@ os_odl-l2_no-ha: configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml os_onos_ha: - configfile: ha_onos_heat_ceilometer_scenario_0.0.1.yaml + configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml os_onos_no-ha: - configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml os_kvm_ha: configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml -- cgit 1.2.3-korg