X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=03439a1c02f86573c557a8579824a153a0f09312;hb=refs%2Fchanges%2F14%2F13514%2F2;hp=943a0804b8b6a11efaedaaa6e4eb110bc845af42;hpb=bc5422cf9fd9d21d7028d445fe1982080101611a;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 943a0804..03439a1c 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -216,22 +216,10 @@ function docker_login() { [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } -function create_k8s_secret_regcred() { - [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function - echo "Creating K8s secret regcred with the docker registry credentials from $HOME/.docker/config.json" - kubectl -n osm create secret generic regcred \ - --from-file=.dockerconfigjson=$HOME/.docker/config.json \ - --type=kubernetes.io/dockerconfigjson - [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function -} - function pull_docker_images() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function echo "Pulling docker images" - if [ -n "${DOCKER_REGISTRY_URL}" ]; then - docker_login - create_k8s_secret_registrycreds - fi + [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login echo "Pulling non-OSM docker images" if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q KAFKA ; then @@ -495,7 +483,6 @@ function install_osm() { [ -n "$DOCKER_REGISTRY_URL" ] && parse_docker_registry_url check_osm_behind_proxy - track checks proxy_ok check_packages "git wget curl tar snapd" @@ -566,7 +553,7 @@ function install_osm() { track docker_images docker_images_ok deploy_charmed_services - track deploy_osm deploy_charmed_services_ok + track deploy_osm deploy_mongodb_ok deploy_osm_services track deploy_osm deploy_osm_services_k8s_ok if [ -n "$INSTALL_K8S_MONITOR" ]; then