Splitting download command in bm-inventory

tsorya · Apr 28, 2020 · ba59857 · ba59857
1 parent fd9fe16
commit ba59857
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -85,6 +85,9 @@ run_full_flow_with_install: run deploy_nodes_with_install
 install_cluster:
 	discovery-infra/install_cluster.py -id $(CLUSTER_ID)
 
+wait_for_cluster:
+	scripts/assisted_deployment.sh	wait_for_cluster
+
 deploy_nodes_with_install:
 	discovery-infra/start_discovery.py -i $(IMAGE) -n $(NUM_MASTERS) -p $(STORAGE_POOL_PATH) -k '$(SSH_PUB_KEY)' -mm $(MASTER_MEMORY) -wm $(WORKER_MEMORY) -nw $(NUM_WORKERS) -ps '$(PULL_SECRET)' -bd $(BASE_DOMAIN) -cN $(CLUSTER_NAME) -vN $(NETWORK_CIDR) -nN $(NETWORK_NAME) -nB $(NETWORK_BRIDGE) -ov $(OPENSHIFT_VERSION) -in
 

diff --git a/scripts/assisted_deployment.sh b/scripts/assisted_deployment.sh
@@ -54,3 +54,5 @@ function run_skipper_make_command() {
 function run_without_os_envs() {
   run_skipper_make_command $1
 }
+
+"$@"
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,3 +54,5 @@ function run_skipper_make_command() { @@
     function run_without_os_envs() {
       run_skipper_make_command $1
     }
+    "$@"