diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 4 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index 7cd845511..a3119f92b 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -23,11 +23,13 @@ services: - {{ conf.MCP_REPO_ROOT_PATH }}:/root/fuel - {{ conf.MCP_REPO_ROOT_PATH }}/mcp/scripts/docker-compose/files/entrypoint.sh:/entrypoint.sh - {{ conf.MCP_STORAGE_DIR }}/pod_config.yml:/root/pod_config.yml - - {{ conf.MCP_STORAGE_DIR }}/base_image_opnfv_fuel_vcp.img:/srv/salt/env/prd/salt/files/control/images/base_image_opnfv_fuel_vcp.img - {{ conf.MCP_STORAGE_DIR }}/nodes:/srv/salt/reclass/nodes - {{ conf.MCP_STORAGE_DIR }}/pki:/etc/pki - {{ conf.MCP_STORAGE_DIR }}/salt:/etc/salt - {{ conf.MCP_STORAGE_DIR }}/hosts:/etc/hosts +{%- if conf.MCP_VCP %} + - {{ conf.MCP_STORAGE_DIR }}/base_image_opnfv_fuel_vcp.img:/srv/salt/env/prd/salt/files/control/images/base_image_opnfv_fuel_vcp.img +{%- endif %} hostname: cfg01 domainname: {{ conf.cluster.domain }} privileged: true diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 293262e89..c6a3d219e 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -270,7 +270,7 @@ function prepare_vms { if [ "${image_dir}/${_tmp}" -ef "${image_dir}/${image}" ]; then echo "[INFO] Patched base image found" else - rm -f "${image_dir}/${image%.*}"* + rm -rf "${image_dir}/${image%.*}"* if [[ ! "${repos_pkgs_str}" =~ ^\^+$ ]]; then echo "[INFO] Patching base image ..." cp "${image_dir}/${_o}" "${image_dir}/${_tmp}" |