Update BMRA to v2.1

[kuberef.git] / deploy.sh

diff --git a/deploy.sh b/deploy.sh
index a491158..7b230f1 100755 (executable)
--- a/deploy.sh
+++ b/deploy.sh
@@ -19,9 +19,6 @@ set -o nounset
 CURRENTPATH=$(git rev-parse --show-toplevel)
 export CURRENTPATH
 
-# Source env variables & functions
-# shellcheck source=./deploy.env
-source "$CURRENTPATH/deploy.env"
 # shellcheck source=./functions.sh
 source "$CURRENTPATH/functions.sh"
 
@@ -30,34 +27,45 @@ source "$CURRENTPATH/functions.sh"
 # ---------------------------------------------------------------------
 check_prerequisites
 
+# shellcheck source=./deploy.env
+source "$CURRENTPATH/deploy.env"
+
 # ---------------------------------------------------------------------
 # bootstrap install prerequisites
 # ---------------------------------------------------------------------
-ansible-playbook -i "$CURRENTPATH"/inventory/localhost.ini \
-    "$CURRENTPATH"/playbooks/bootstrap.yaml
+run_playbook bootstrap
 
 # ---------------------------------------------------------------------
 # Create jump VM from which the installation is performed
 # ---------------------------------------------------------------------
-ansible-playbook -i "$CURRENTPATH"/inventory/localhost.ini \
-    "$CURRENTPATH"/playbooks/jump-vm.yaml
+run_playbook jump-vm
 
 # ---------------------------------------------------------------------
-# Copy files needed by Infra engine & BMRA in the jumphost VM
+# Create BMRA config based on IDF and PDF
 # ---------------------------------------------------------------------
-copy_files_jump
+run_playbook bmra-config
 
 # ---------------------------------------------------------------------
-# Provision remote hosts
+# Copy files needed by Infra engine & BMRA in the jumphost VM
 # ---------------------------------------------------------------------
-provision_hosts
+copy_files_jump
 
 # ---------------------------------------------------------------------
+# Provision remote hosts
 # Setup networking (Adapt according to your network setup)
 # ---------------------------------------------------------------------
-setup_network
+if [[ "$DEPLOYMENT" == "full" ]]; then
+    provision_hosts
+    setup_network
+fi
 
 # ---------------------------------------------------------------------
 # Provision k8s cluster (currently BMRA)
 # ---------------------------------------------------------------------
 provision_k8s
+
+# ---------------------------------------------------------------------
+# Copy kubeconfig to desired location
+# ---------------------------------------------------------------------
+copy_k8s_config
+