diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2019-01-30 10:29:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-30 10:29:53 +0000 |
| commit | c2ea7deba73e335ace30eba1db7e2f80d3c1daed (patch) | |
| tree | 1ba674d2cdba968baf46e731b1c952b2df6cf97f /mcp | |
| parent | 7a8e227fa7fd0a5055d9c340fff9e014b35a1610 (diff) | |
| parent | 9aab7f2859e336594fe299c397660b5b38204e02 (diff) | |
Merge "[deploy] Allow only operating system install"
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/scripts/xdf_data.sh.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mcp/scripts/xdf_data.sh.j2 b/mcp/scripts/xdf_data.sh.j2 index e762fe957..4db5593e3 100644 --- a/mcp/scripts/xdf_data.sh.j2 +++ b/mcp/scripts/xdf_data.sh.j2 @@ -12,6 +12,7 @@ # {%- import 'net_map.j2' as nm with context -%} +{%- set cluster_states = conf.cluster.states if conf.MCP_NO_DEPLOY_ENVIRONMENT < 2 else [] -%} {%- set arch = conf[conf.MCP_JUMP_ARCH] -%} {%- set V = conf.virtual -%} {%- do V.nodes.update(arch.default.virtual.nodes) -%} @@ -100,7 +101,7 @@ OPNFV_BRIDGES=( ) export CLUSTER_DOMAIN={{ conf.cluster.domain }} -cluster_states={{ bash_arr(arch.default.cluster.states + conf.cluster.states) }} +cluster_states={{ bash_arr(arch.default.cluster.states + cluster_states) }} virtual_nodes={{ filter_nodes('virtual') }} control_nodes_query={{ filter_nodes(['baremetal', 'virtual'], True, ['control']) }} base_image={{ arch.base_image }} |