aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/scripts
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-07 16:36:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-07 16:36:30 +0000
commitd630ceae00b342695e703fc0e7b485e901cb65f3 (patch)
treec82523aac35c783996d7c4658eac30968e172fab /mcp/scripts
parent6da4060d054c66f3d0c17cfa885f6bfe171c5121 (diff)
parenta21457cc96a640700736189612261e9bcae3d825 (diff)
Merge "[novcp] Add deploy argument `-N` (experimental)"
Diffstat (limited to 'mcp/scripts')
-rwxr-xr-xmcp/scripts/salt.sh1
-rw-r--r--mcp/scripts/xdf_data.sh.j22
2 files changed, 2 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index dfeba8fea..ad4707369 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -113,6 +113,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage'
wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true
+ salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper
salt -C "E@^(${NODE_MASK}).*" system.reboot
wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping'
wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False dist_upgrade=True'
diff --git a/mcp/scripts/xdf_data.sh.j2 b/mcp/scripts/xdf_data.sh.j2
index ad3c0fe1e..8c9d5d969 100644
--- a/mcp/scripts/xdf_data.sh.j2
+++ b/mcp/scripts/xdf_data.sh.j2
@@ -38,7 +38,7 @@
{%- macro serialize_apt_pkg() -%}
{%- set arr = [] -%}
{%- set sections = [arch.common] -%}
- {%- if 'virtual_control_plane' in conf.cluster.states -%}
+ {%- if conf.MCP_VCP -%}
{%- do sections.append(arch.control) -%}
{%- endif -%}
{%- for c in sections -%}