summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/xdf_data.sh.j2
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-04 14:15:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-04 14:15:01 +0000
commit381d952bf505cda14088ac39f9a53229f70b8ef7 (patch)
tree2405073cbd3a50d47ee99f0d3aa9056f641458f7 /mcp/scripts/xdf_data.sh.j2
parent8cc4a610b6769b57f41801f2885fe3044ee428c2 (diff)
parentf6cae340635775ecd339a08e78ef583ecca092ec (diff)
Merge "[scenario] Factor out common nodes, states"
Diffstat (limited to 'mcp/scripts/xdf_data.sh.j2')
-rw-r--r--mcp/scripts/xdf_data.sh.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/mcp/scripts/xdf_data.sh.j2 b/mcp/scripts/xdf_data.sh.j2
index b8c32135c..ee5fffab7 100644
--- a/mcp/scripts/xdf_data.sh.j2
+++ b/mcp/scripts/xdf_data.sh.j2
@@ -14,6 +14,7 @@
{%- import 'net_map.j2' as nm with context -%}
{%- set arch = conf[conf.MCP_JUMP_ARCH] -%}
{%- set V = conf.virtual -%}
+{%- do V.nodes.update(arch.default.virtual.nodes) -%}
{%- set section_map = {
'infra': -1,
'control': nm.ctl01.idx,
@@ -87,7 +88,7 @@ OPNFV_BRIDGES=(
)
export CLUSTER_DOMAIN={{ conf.cluster.domain }}
-cluster_states={{ bash_arr(conf.cluster.states) }}
+cluster_states={{ bash_arr(arch.default.cluster.states + conf.cluster.states) }}
virtual_nodes={{ filter_nodes('virtual') }}
control_nodes_query={{ filter_nodes(['baremetal', 'virtual'], True, ['control']) }}
base_image={{ arch.base_image }}