summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-02 13:38:53 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-02 13:39:30 +0200
commit5926aeda1c7ff35f21277c2361678ce7834d981c (patch)
treea9db8c96aaae14ba58d3f151b4b9ae66bff4ada2
parent7edcb241199b7da1d33ec817fa09973177ca6a8b (diff)
Rebase: adapt patch after deploy-config refactor.
Change-Id: I97c9c79bb342d6c7504414134649795689b5e78b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0011-deploy-config-honor-interfaces-and-transformations.patch11
1 files changed, 4 insertions, 7 deletions
diff --git a/patches/opnfv-fuel/0011-deploy-config-honor-interfaces-and-transformations.patch b/patches/opnfv-fuel/0011-deploy-config-honor-interfaces-and-transformations.patch
index 1567e85b..131843c7 100644
--- a/patches/opnfv-fuel/0011-deploy-config-honor-interfaces-and-transformations.patch
+++ b/patches/opnfv-fuel/0011-deploy-config-honor-interfaces-and-transformations.patch
@@ -36,27 +36,24 @@ diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index 88a1111..5dfb863 100644
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
-@@ -167,6 +167,7 @@ dea_base_sha = sha_uri(kwargs["dea_base_uri"])
+@@ -167,5 +167,6 @@ dea_base_sha = sha_uri(kwargs["dea_base_uri"])
dea_base_comment = dea_base_conf['dea-base-config-metadata']['comment']
dea_base_conf.pop('dea-base-config-metadata')
final_dea_conf = dea_base_conf
+dea_pod_override_nodes = None
# Fetch dea-pod-override, extract and purge meta-data, merge with previous dea data structure
- print 'Parsing the dea-pod-override from: ' + kwargs["dea_pod_override_uri"] + "...."
-@@ -180,6 +181,9 @@ if dea_pod_override_conf:
- dea_pod_comment = dea_pod_override_conf['dea-pod-override-config-metadata']['comment']
- print 'Merging dea-base and dea-pod-override configuration ....'
+@@ -180,4 +181,7 @@ if dea_pod_override_conf:
dea_pod_override_conf.pop('dea-pod-override-config-metadata')
+ # Copy the list of original nodes, which holds info on their transformations
+ if dea_pod_override_conf.has_key('nodes'):
+ dea_pod_override_nodes = list(dea_pod_override_conf['nodes'])
if dea_pod_override_conf:
- final_dea_conf = dict(mergedicts(final_dea_conf, dea_pod_override_conf))
+ final_dea_conf = dict(merge_dicts(final_dea_conf, dea_pod_override_conf))
@@ -245,6 +249,25 @@ if deploy_scenario_conf["stack-extensions"]:
dea_scenario_module_override_conf['settings']['editable'][module["module"]] = scenario_module_override_conf
- final_dea_conf = dict(mergedicts(final_dea_conf, dea_scenario_module_override_conf))
+ final_dea_conf = dict(merge_dicts(final_dea_conf, dea_scenario_module_override_conf))
+def get_node_ifaces_and_trans(nodes, nid):
+ for node in nodes: