Merge pull request #78 from stackhpc/fix-multinode-sh

Alex-Welsh · web-flow · commit 43ec13e2a894 · 2024-11-12T11:44:31.000Z
Replace KAYOBE_CONFIG_ROOT with KAYOBE_CONFIG_PATH
diff --git a/ansible/files/multinode.sh b/ansible/files/multinode.sh
@@ -371,7 +371,7 @@ function upgrade_overcloud() {
 function upgrade_prerequisites() {
   # Run the upgrade prerequisites script if it exists.
   workaround_ansible_rc13_bug
-  [[ ! -f $KAYOBE_CONFIG_ROOT/tools/upgrade-prerequisites.sh ]] || $KAYOBE_CONFIG_ROOT/tools/upgrade-prerequisites.sh
+  [[ ! -f $KAYOBE_CONFIG_PATH/../../tools/upgrade-prerequisites.sh ]] || $KAYOBE_CONFIG_PATH/../../tools/upgrade-prerequisites.sh
 }
 
 function usage() {

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ function upgrade_overcloud() {`
`371`	`371`	`function upgrade_prerequisites() {`
`372`	`372`	`# Run the upgrade prerequisites script if it exists.`
`373`	`373`	`workaround_ansible_rc13_bug`
`374`		`- [[ ! -f $KAYOBE_CONFIG_ROOT/tools/upgrade-prerequisites.sh ]] \|\| $KAYOBE_CONFIG_ROOT/tools/upgrade-prerequisites.sh`
	`374`	`+ [[ ! -f $KAYOBE_CONFIG_PATH/../../tools/upgrade-prerequisites.sh ]] \|\| $KAYOBE_CONFIG_PATH/../../tools/upgrade-prerequisites.sh`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`function usage() {`