From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 22 Oct 2018 14:47:28 +0000 (+0200)
Subject: Reordering install_lightweight to init swarm before building docker images
X-Git-Tag: v5.0.0~31
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f3cf8b8d76e3d45cee8dc72c057907004a953aec;p=osm%2Fdevops.git

Reordering install_lightweight to init swarm before building docker images

Change-Id: Id6700aa6eba58cc85d407fdce1756d01237bd298
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ddff44af..36049cc0 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -959,12 +959,12 @@ function install_lightweight() {
     [ -n "$INSTALL_NODOCKER" ] || install_docker_ce
     track docker_ce
     #install_docker_compose
+    [ -n "$INSTALL_NODOCKER" ] || init_docker_swarm
     [ -z "$DOCKER_NOBUILD" ] && generate_docker_images
     track docker_build
     generate_docker_env_files
     generate_config_log_folders
 
-    [ -n "$INSTALL_NODOCKER" ] || init_docker_swarm
     # remove old stack
     remove_stack $OSM_STACK_NAME
     create_docker_network