From f69804baf9287f7f39ba58995d2b8ae5a98e30db Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 22 Jan 2024 13:09:21 +0100 Subject: [PATCH] Rename INSTALL_NODOCKER to INSTALL_DOCKER in full_install_osm.sh Change-Id: I62a3a7c650e40477a3a1c46e26ca8b440f253c3a Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 21a654d2..c38a364f 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -483,7 +483,7 @@ function install_osm() { track prereq prereqok_ok - if [ ! -n "$INSTALL_NODOCKER" ]; then + if [ -n "$INSTALL_DOCKER" ]; then DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}" [ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}" [ -n "${OSM_BEHIND_PROXY}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -P" @@ -641,7 +641,7 @@ function dump_vars(){ echo "INSTALL_LIGHTWEIGHT=$INSTALL_LIGHTWEIGHT" echo "INSTALL_LXD=$INSTALL_LXD" echo "INSTALL_NGSA=$INSTALL_NGSA" - echo "INSTALL_NODOCKER=$INSTALL_NODOCKER" + echo "INSTALL_DOCKER=$INSTALL_DOCKER" echo "INSTALL_ONLY=$INSTALL_ONLY" echo "INSTALL_PLA=$INSTALL_PLA" echo "INSTALL_TO_OPENSTACK=$INSTALL_TO_OPENSTACK" @@ -722,7 +722,7 @@ OPENSTACK_VM_NAME="server-osm" OPENSTACK_PYTHON_VENV="$HOME/.virtual-envs/osm" INSTALL_ONLY="" TO_REBUILD="" -INSTALL_NODOCKER="" +INSTALL_DOCKER="y" INSTALL_JUJU="" INSTALL_NOHOSTCLIENT="" INSTALL_CACHELXDIMAGES="" @@ -882,7 +882,8 @@ while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; [ "${OPTARG}" == "lxdinstall" ] && INSTALL_LXD="y" && continue [ "${OPTARG}" == "lxd" ] && INSTALL_LXD="y" && continue [ "${OPTARG}" == "nolxd" ] && INSTALL_LXD="" && continue - [ "${OPTARG}" == "nodocker" ] && INSTALL_NODOCKER="y" && continue + [ "${OPTARG}" == "docker" ] && INSTALL_DOCKER="y" && continue + [ "${OPTARG}" == "nodocker" ] && INSTALL_DOCKER="" && continue [ "${OPTARG}" == "showopts" ] && SHOWOPTS="y" && continue [ "${OPTARG}" == "nohostports" ] && NO_HOST_PORTS="y" && continue [ "${OPTARG}" == "juju" ] && INSTALL_JUJU="y" && continue -- 2.25.1