diff --git a/specs/default/cluster-init/files/default.sh b/specs/default/cluster-init/files/constants.sh similarity index 81% rename from specs/default/cluster-init/files/default.sh rename to specs/default/cluster-init/files/constants.sh index 3da1a1f..7c80631 100644 --- a/specs/default/cluster-init/files/default.sh +++ b/specs/default/cluster-init/files/constants.sh @@ -1,4 +1,4 @@ PBSPRO_AUTOSCALE_VERSION="2.1.0" -PBSPRO_VERSION="20.0.1-0" +DEFAULT_PBSPRO_VERSION="20.0.1-0" PBSPRO_HWLOCS_LIB_EL8="hwloc-libs-1.11.9-3.el8.x86_64.rpm" CONFIG_PATH="/opt/cycle/jetpack/config/connection.json" \ No newline at end of file diff --git a/specs/default/cluster-init/files/hwlocs-install.sh b/specs/default/cluster-init/files/hwlocs-install.sh index d98a2f9..6e6ff7b 100755 --- a/specs/default/cluster-init/files/hwlocs-install.sh +++ b/specs/default/cluster-init/files/hwlocs-install.sh @@ -1,7 +1,7 @@ #!/bin/bash source "${CYCLECLOUD_PROJECT_PATH}/default/files/utils.sh" || exit 1 -source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || fail +source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || fail PLATFORM_VERSION=$(jetpack props get os.version) || fail diff --git a/specs/default/cluster-init/files/utils.sh b/specs/default/cluster-init/files/utils.sh index de46cce..995c9df 100644 --- a/specs/default/cluster-init/files/utils.sh +++ b/specs/default/cluster-init/files/utils.sh @@ -1,6 +1,6 @@ #!/bin/bash -source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || exit 1 +source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || exit 1 function fail() { local errorMsg="$1" @@ -27,10 +27,12 @@ function get_package_name() { local package_type=$1 # Contains "server", "client", or "execution" if [[ -z "$package_name" ]]; then - if [[ "${PBSPRO_VERSION%%.*}" -lt 20 ]]; then - echo "pbspro-${package_type}-${PBSPRO_VERSION}.x86_64.rpm" + local pbspro_version + pbspro_version=$(jetpack config pbspro.version "$DEFAULT_PBSPRO_VERSION") || fail + if [[ "${pbspro_version%%.*}" -lt 20 ]]; then + echo "pbspro-${package_type}-${pbspro_version}.x86_64.rpm" else - echo "openpbs-${package_type}-${PBSPRO_VERSION}.x86_64.rpm" + echo "openpbs-${package_type}-${pbspro_version}.x86_64.rpm" fi else echo "$package_name" diff --git a/specs/default/cluster-init/roles/server-install.sh b/specs/default/cluster-init/roles/server-install.sh index 76ea0dc..43d1c8e 100644 --- a/specs/default/cluster-init/roles/server-install.sh +++ b/specs/default/cluster-init/roles/server-install.sh @@ -1,7 +1,7 @@ #!/bin/bash source "${CYCLECLOUD_PROJECT_PATH}/default/files/utils.sh" || exit 1 -source "${CYCLECLOUD_PROJECT_PATH}/default/files/default.sh" || fail +source "${CYCLECLOUD_PROJECT_PATH}/default/files/constants.sh" || fail CLUSTER_NAME=$(jq -r .cluster "$CONFIG_PATH") || fail CONNECTION_URL=$(jq -r .url "$CONFIG_PATH") || fail IGNORE_WORKQ=$(jetpack config pbspro.queues.workq.ignore "False") || fail