diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-10 19:31:52 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-01-10 21:52:43 +0100 |
| commit | 283bf98d087afd9073632340800e745f5a8d8de2 (patch) | |
| tree | 481d98f94332db27a50cad8952db49c2a4aa8573 /deploy/deploy-config.py | |
| parent | 7fd2619e0df370fa832eeff00790bcaa52dc4ffc (diff) | |
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 <jonas.bjurel@ericsson.com>
Diffstat (limited to 'deploy/deploy-config.py')
| -rw-r--r-- | deploy/deploy-config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index f94466fe8..d9e774141 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -266,7 +266,7 @@ final_dha_conf = dha_pod_conf dha_scenario_override_conf = deploy_scenario_conf["dha-override-config"] if dha_scenario_override_conf: print 'Merging dha-pod and deployment-scenario override information to final dha.yaml configuration....' - final_dha_conf = dict(mergedicts(dha_base_conf, dha_scenario_override_conf)) + final_dha_conf = dict(mergedicts(final_dha_conf, dha_scenario_override_conf)) # Dump final dha.yaml to argument provided directory print 'Dumping final dha.yaml to ' + kwargs["output_path"] + '/dha.yaml....' |