Post GTS20 Bootcamp Staging updates

mlavi · Mar 6, 2020 · 13d487f · 13d487f
1 parent cf3f476
commit 13d487f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,8 @@ After HPoC Foundation, you can have push-button Calm in about half an hour!
 # Table of Contents #
 <!-- MDTOC maxdepth:6 firsth1:0 numbering:0 flatten:0 bullets:1 updateOnSave:1 -->
 
-- [Available Workshops](#available-workshops)   
+- [How To Workshop](#howto-workshop)
+- [Available Workshops](#available-workshops)
 - [HPoC Cluster Reservation](#hpoc-cluster-reservation)   
 - [Staging Your HPoC](#staging-your-hpoc)   
    - [Interactive Usage](#interactive-usage)   
@@ -17,6 +18,10 @@ After HPoC Foundation, you can have push-button Calm in about half an hour!
 
 <!-- /MDTOC -->
 ---
+## How To Workshop ##
+
+Please review the How To Workshop for the latest instructions http://ntnx.tips/howto
+
 ## Available Workshops ##
 
 1. Calm Introduction Workshop (AOS/AHV 5.5+)

diff --git a/scripts/lib.pe.sh b/scripts/lib.pe.sh
@@ -250,7 +250,7 @@ acli "vm.disk_create ${PrismOpsServer} clone_from_image=${PrismOpsServer}"
 #acli "vm.nic_create ${PrismOpsServer} network=${NW1_NAME}"
 acli "vm.nic_create ${PrismOpsServer} network=${NW1_NAME} ip=${PrismOpsServer_HOST}"
 
-log "Power on ${VPrismOpsServer} VM..."
+log "Power on ${PrismOpsServer} VM..."
 acli "vm.on ${PrismOpsServer}"
 
 
@@ -782,7 +782,7 @@ function pc_configure() {
   ## TODO: If DEBUG is set, we run the below command with bash -x
   _command="EMAIL=${EMAIL} \
     PC_HOST=${PC_HOST} PE_HOST=${PE_HOST} PE_PASSWORD=${PE_PASSWORD} \
-    PC_LAUNCH=${PC_LAUNCH} PC_VERSION=${PC_VERSION} nohup bash -x ${HOME}/${PC_LAUNCH} PC"
+    PC_LAUNCH=${PC_LAUNCH} PC_VERSION=${PC_VERSION} nohup bash ${HOME}/${PC_LAUNCH} PC"
   log "Remote asynchroneous launch PC configuration script... ${_command}"
   remote_exec 'ssh' 'PC' "${_command} >> ${HOME}/${PC_LAUNCH%%.sh}.log 2>&1 &"
   log "PC Configuration complete: try Validate Staged Clusters now."

diff --git a/stage_workshop.sh b/stage_workshop.sh
@@ -24,9 +24,9 @@ WORKSHOPS=(\
 "Basic / API Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
 "Private Cloud Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
 "Databases with Era Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
-"Citrix Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
 "Files Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
 "Calm Workshop (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
+"Citrix Bootcamp (AOS 5.11.x/AHV PC 5.11.2.1) = Current" \
 ) # Adjust function stage_clusters, below, for file/script mappings as needed
 
 function stage_clusters() {
@@ -112,7 +112,6 @@ function stage_clusters() {
     _pc_launch=${_pe_launch}
   fi
 
-
   dependencies 'install' 'sshpass'
 
   if [[ -z ${PC_VERSION} ]]; then