diff --git a/clusters/common/Makefile b/clusters/common/Makefile index 93c842253..00eca5098 100644 --- a/clusters/common/Makefile +++ b/clusters/common/Makefile @@ -446,7 +446,11 @@ vpath % $(PROVISIONED_D) # ie. all PROVISIONED, all POWEROFF, all UNPROVISION up provision: $(VAGRANTFILE) $(TARGET_PROVIDER_FILES) verifylocalenv $(PROVISIONED_FLAGS) ingest-state - echo started: $(HUMAN_TSTAMP) + # XXX pull from cluster definition & generator + #sudo mariadb -r -B -s -e "UPDATE cluster_table SET control_host = '192.168.56.64' WHERE NAME= 'vc';" slurm_acct_db + #sudo mariadb -r -B -s -e "UPDATE cluster_table SET control_host = '192.168.56.50' WHERE NAME= 'vx';" slurm_acct_db + #sudo mariadb -r -B -s -e 'select * from cluster_table;' slurm_acct_db + #echo started: $(HUMAN_TSTAMP) up! provision!: unprovision up ingest-state @@ -635,4 +639,4 @@ $(XFR_VBOXADD_ISO): $(TARBALLS_VBOXADD_ISO) rsync -LHcau $< $@ ; \ fi -# vim: background=dark +# vim: background=dark ts=2 sw=2 syntax=make diff --git a/clusters/common/Vagrantfile.d/Vagrantfile.template b/clusters/common/Vagrantfile.d/Vagrantfile.template index e325a7242..e9af0c79a 100644 --- a/clusters/common/Vagrantfile.d/Vagrantfile.template +++ b/clusters/common/Vagrantfile.d/Vagrantfile.template @@ -7,7 +7,7 @@ require 'pathname' # following should allow for a full copy of the centos/{os,updates} repositories + pad -REPODISK_SIZE = 20 # Gb +REPODISK_SIZE = 32 # Gb clustername_fullpath_raw = %x[pwd] clustername_fullpath = "#{clustername_fullpath_raw}" diff --git a/clusters/common/bin/provision.sh b/clusters/common/bin/provision.sh index 5373b46ae..61e104f39 100755 --- a/clusters/common/bin/provision.sh +++ b/clusters/common/bin/provision.sh @@ -539,7 +539,7 @@ ConfigureCentOSRepos() { return fi - repos_size=$(du -x -s -m ${_have_repos} 2>&1 | awk '{print $1}') + repos_size=$(cd ${_have_repos}; du -x -s -m . 2>&1 | awk '{print $1}') if ! [[ ${repos_size} =~ ${numeric} ]] ; then ErrExit ${EX_CONFIG} "ingest repository is corrupt or empty: ${repos_size}" fi @@ -2223,8 +2223,18 @@ SW() { ErrExit ${EX_SOFTWARE} "${what}/${_s}/${stop_flag} present" fi cmds=$(echo $(ls ${what}/${_s})) + + if [ -L "${where}" ] ; then + local target=$(readlink -e "${where}") + if [ -f "${target}" ] ; then + Rc ErrExit ${EX_OSFILE} "rm -f ${where}" + elif [ -d "${target}" ] ; then + Rc ErrExit ${EX_OSFILE} "rmdir ${where}" + fi + fi Rc ErrExit ${EX_OSFILE} "mkdir -p ${where}" Rc ErrExit ${EX_OSFILE} "chmod 0755 ${where}" + local c for c in ${cmds} do diff --git a/clusters/common/env/site-vars.sh b/clusters/common/env/site-vars.sh index d959abb0d..805025fd1 100755 --- a/clusters/common/env/site-vars.sh +++ b/clusters/common/env/site-vars.sh @@ -3,3 +3,11 @@ export LANGUAGE=${LANGUAGE:-${LANG}} export LC_ALL=${LC_ALL:-${LANG}} export TZ=${TZ:-MST7MDT} + +export LANL_PROTO=http +export LANL_PROXY_HOST=proxyout.lanl.gov +export LANL_PROXY_PORT=8080 +export LANL_PROXY=${LANL_PROTO}://${LANL_PROXY_HOST}:${LANL_PROXY_PORT} +export http_proxy=${LANL_PROXY} +export https_proxy=${LANL_PROXY} +export proxy=${LANL_PROXY} diff --git a/clusters/vc/cfg/vc1/requires/vcdb/2.socket-SLURMDBD b/clusters/vc/cfg/vc1/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index 1a52c74cf..000000000 --- a/clusters/vc/cfg/vc1/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vc/cfg/vc1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vc1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vc1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vc1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vc1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vc1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vc2/requires/vcdb/2.socket-SLURMDBD b/clusters/vc/cfg/vc2/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index 1a52c74cf..000000000 --- a/clusters/vc/cfg/vc2/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vc/cfg/vc2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vc2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vc2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vc2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vc2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vc2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vc2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vc2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcaltdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf b/clusters/vc/cfg/vcaltdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf index a3ccc5a53..ec0504bb1 100644 --- a/clusters/vc/cfg/vcaltdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf +++ b/clusters/vc/cfg/vcaltdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf @@ -1,4 +1,3 @@ [mysqld] -innodb_buffer_pool_size=5120 innodb_flush_log_at_trx_commit=1 innodb_lock_wait_timeout=900 diff --git a/clusters/vc/cfg/vcaltdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf b/clusters/vc/cfg/vcaltdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf index a3ccc5a53..ec0504bb1 100644 --- a/clusters/vc/cfg/vcaltdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf +++ b/clusters/vc/cfg/vcaltdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf @@ -1,4 +1,3 @@ [mysqld] -innodb_buffer_pool_size=5120 innodb_flush_log_at_trx_commit=1 innodb_lock_wait_timeout=900 diff --git a/clusters/vc/cfg/vcaltdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcaltdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vcaltdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcaltdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcaltdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcaltdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vcaltdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcaltdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcaltdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcaltdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vcaltdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcaltdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/mariadb-enterprise/add/MariaDB-compat b/clusters/vc/cfg/vcaltdb/rpm/flagged/WHICH_DB/mariadb-community/add/MariaDB-compat similarity index 100% rename from clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/mariadb-enterprise/add/MariaDB-compat rename to clusters/vc/cfg/vcaltdb/rpm/flagged/WHICH_DB/mariadb-community/add/MariaDB-compat diff --git a/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/1.setup-prereqs b/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/1.setup-prereqs index d8589cab6..098053a49 100755 --- a/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/1.setup-prereqs +++ b/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/1.setup-prereqs @@ -25,6 +25,8 @@ if [ -n "${OUT}" ] ; then exec > >(tee -a "${OUT}") 2>&1 fi +set -xv + HOSTNAME=${HOSTNAME:-$(hostname -s)} CLUSTERNAME=${HOSTNAME:0:2} XFR=/${CLUSTERNAME}/xfr @@ -71,10 +73,25 @@ if [ ! -d "${BUILDWHERE_PRODUCT}" ] ; then fi if [ ! -r "${SLURM_SPANK_LUA_SPEC}" ] ; then need_ingest=true +else + SLURM_SPANK_LUA_SPEC_VERSION=$(awk '/Version:/ {print $2}' ${SLURM_SPANK_LUA_SPEC}) + if [ "${SLURM_SPANK_LUA_SPEC_VERSION}" != "${SLURM_SPANK_LUA_VERSION}" ] ; then + Verbose " SLURM_SPANK_LUA_VERSION: ${SLURM_SPANK_LUA_VERSION}" + Verbose " SLURM_SPANK_LUA_SPEC_VERSION: ${SLURM_SPANK_LUA_SPEC_VERSION}" + ErrExit ${EX_OSFILE} "Update VERSION_FILE to: ${SLURM_SPANK_LUA_SPEC_VERSION}" + fi fi if [ -n "${need_ingest}" ] ; then Verbose " recreating BUILDWHERE_PRODUCT:${BUILDWHERE_PRODUCT}" + if [ -L "${BUILDWHERE_PRODUCT}" ] ; then + target=$(readlink -e ${BUILDWHERE_PRODUCT}) + Verbose " BUILDWHERE_PRODUCT -> ${target}" + if [ "${target}" != "${BUILDWHERE_PRODUCT_VERSION}" ] ; then + Verbose " target:${target} != ${BUILDWHERE_PRODUCT_VERSION} -- version mismatch?" + Rc ErrExit ${EX_OSFILE} "rm -f ${BUILDWHERE_PRODUCT_VERSION}" + fi + fi if [ -r ${XFR}/${SLURM_SPANK_LUA_TARBALL} ] ; then if [ ! -d ${BUILDWHERE_PRODUCT} ] ; then Rc ErrExit ${EX_OSFILE} "tar -xzf ${XFR}/${SLURM_SPANK_LUA_TARBALL} -C ${BUILDWHERE}" @@ -128,4 +145,5 @@ fi Rc ErrExit ${EX_OSFILE} "cp -v --preserve=all ${RPMBUILD}/SOURCES/${slurm_spank_lua_vers}${TAR_SUFFIX} ${XFR}" exit ${EX_OK} -# vim: background=dark + +# vim: background=dark ts=2 sw=2 syntax=sh diff --git a/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/version b/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/version index 68f379042..4911aab39 100644 --- a/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/version +++ b/clusters/vc/cfg/vcbuild/build/slurm-spank-lua/version @@ -1 +1 @@ -0.43 +0.45 diff --git a/clusters/vc/cfg/vcbuild/build/slurm/version b/clusters/vc/cfg/vcbuild/build/slurm/version index 08c31febe..ecd0d1d9a 100644 --- a/clusters/vc/cfg/vcbuild/build/slurm/version +++ b/clusters/vc/cfg/vcbuild/build/slurm/version @@ -1 +1 @@ -21.08.2 +22.05.2 diff --git a/clusters/vc/cfg/vcbuild/rpm/early/keyutils-1.5.8-3.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/keyutils-1.5.8-3.el7.x86_64.rpm index b3a332d2e..f42ab34d1 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/keyutils-1.5.8-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/keyutils-1.5.8-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libbasicobjects-0.1.1-32.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libbasicobjects-0.1.1-32.el7.x86_64.rpm index 91de0fb5c..daacdbbb6 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libbasicobjects-0.1.1-32.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libbasicobjects-0.1.1-32.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libcgroup-0.41-21.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libcgroup-0.41-21.el7.x86_64.rpm index 97aae4fff..76c3a37eb 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libcgroup-0.41-21.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libcgroup-0.41-21.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libcollection-0.7.0-32.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libcollection-0.7.0-32.el7.x86_64.rpm index 14db63050..a1b287171 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libcollection-0.7.0-32.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libcollection-0.7.0-32.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libev-4.15-7.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libev-4.15-7.el7.x86_64.rpm index f0c40ddcb..3fa64399d 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libev-4.15-7.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libev-4.15-7.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libevent-2.0.21-4.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libevent-2.0.21-4.el7.x86_64.rpm index 30965cad9..236176610 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libevent-2.0.21-4.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libevent-2.0.21-4.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libini_config-1.3.1-32.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libini_config-1.3.1-32.el7.x86_64.rpm index 78540abc7..40344da04 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libini_config-1.3.1-32.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libini_config-1.3.1-32.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libnfsidmap-0.25-19.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libnfsidmap-0.25-19.el7.x86_64.rpm index 144cc1bdc..ffd9b9f29 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libnfsidmap-0.25-19.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libnfsidmap-0.25-19.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libpath_utils-0.2.1-32.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libpath_utils-0.2.1-32.el7.x86_64.rpm index 9ed004ec9..985ea4b87 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libpath_utils-0.2.1-32.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libpath_utils-0.2.1-32.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libpcap-1.5.3-12.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libpcap-1.5.3-12.el7.x86_64.rpm index f4bf5a1af..e68eed681 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libpcap-1.5.3-12.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libpcap-1.5.3-12.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libref_array-0.1.5-32.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libref_array-0.1.5-32.el7.x86_64.rpm index 2dfe07e78..b8bd4383d 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libref_array-0.1.5-32.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libref_array-0.1.5-32.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libtirpc-0.2.4-0.16.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libtirpc-0.2.4-0.16.el7.x86_64.rpm index d9cbd61d0..0a7aece86 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libtirpc-0.2.4-0.16.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libtirpc-0.2.4-0.16.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libverto-0.2.5-4.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libverto-0.2.5-4.el7.x86_64.rpm index 26dd60611..e578cf665 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libverto-0.2.5-4.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libverto-0.2.5-4.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/libverto-libevent-0.2.5-4.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/libverto-libevent-0.2.5-4.el7.x86_64.rpm index 76d557ef0..a76d73153 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/libverto-libevent-0.2.5-4.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/libverto-libevent-0.2.5-4.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/policycoreutils-python-2.5-34.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/policycoreutils-python-2.5-34.el7.x86_64.rpm index fcb5438a9..b177d2095 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/policycoreutils-python-2.5-34.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/policycoreutils-python-2.5-34.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/pygobject2-2.28.6-11.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/pygobject2-2.28.6-11.el7.x86_64.rpm index 0c6445f02..3c2850dce 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/pygobject2-2.28.6-11.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/pygobject2-2.28.6-11.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/quota-4.01-19.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/quota-4.01-19.el7.x86_64.rpm index 183f2bcfa..49f85a581 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/quota-4.01-19.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/quota-4.01-19.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/quota-nls-4.01-19.el7.noarch.rpm b/clusters/vc/cfg/vcbuild/rpm/early/quota-nls-4.01-19.el7.noarch.rpm index fe93cefb8..10cf8f7cc 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/quota-nls-4.01-19.el7.noarch.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/quota-nls-4.01-19.el7.noarch.rpm differ diff --git a/clusters/vc/cfg/vcbuild/rpm/early/setools-libs-3.3.8-4.el7.x86_64.rpm b/clusters/vc/cfg/vcbuild/rpm/early/setools-libs-3.3.8-4.el7.x86_64.rpm index d197dfb6c..fd4039995 100644 Binary files a/clusters/vc/cfg/vcbuild/rpm/early/setools-libs-3.3.8-4.el7.x86_64.rpm and b/clusters/vc/cfg/vcbuild/rpm/early/setools-libs-3.3.8-4.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf b/clusters/vc/cfg/vcdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf index 5347142c2..ec0504bb1 100644 --- a/clusters/vc/cfg/vcdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf +++ b/clusters/vc/cfg/vcdb/config/mariadb-community/my.cnf.d/Z-local-3.innodb.cnf @@ -1,4 +1,3 @@ [mysqld] -innodb_buffer_pool_size=1280M innodb_flush_log_at_trx_commit=1 innodb_lock_wait_timeout=900 diff --git a/clusters/vc/cfg/vcdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf b/clusters/vc/cfg/vcdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf index 5347142c2..ec0504bb1 100644 --- a/clusters/vc/cfg/vcdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf +++ b/clusters/vc/cfg/vcdb/config/mariadb-enterprise/my.cnf.d/Z-local-3.innodb.cnf @@ -1,4 +1,3 @@ [mysqld] -innodb_buffer_pool_size=1280M innodb_flush_log_at_trx_commit=1 innodb_lock_wait_timeout=900 diff --git a/clusters/vc/cfg/vcdb/config/slurm/3.start-slurmdbd-service b/clusters/vc/cfg/vcdb/config/slurm/3.start-slurmdbd-service old mode 100755 new mode 100644 index ac1034100..927ac315c --- a/clusters/vc/cfg/vcdb/config/slurm/3.start-slurmdbd-service +++ b/clusters/vc/cfg/vcdb/config/slurm/3.start-slurmdbd-service @@ -22,17 +22,20 @@ if [ -n "${OUT}" ] ; then exec > >(tee -a "${OUT}") 2>&1 fi -Rc ErrExit 4 "systemctl start slurmdbd" - -isactive=$(systemctl status slurmdbd | grep Active: | awk '{print $2}') -if [ "${isactive}" != "active" ] ; then - ErrExit ${EX_CONFIG} "slurmdbd failed to start correctly: ${isactive}" +DBDHost=$(grep AccountingStorageHost= /etc/slurm/slurm.conf | sed 's/AccountingStorageHost=//') +if [ "${DBDHost}" = $(hostname -s) ] ; then + Rc ErrExit 4 "systemctl start slurmdbd" + + isactive=$(systemctl status slurmdbd | grep Active: | awk '{print $2}') + if [ "${isactive}" != "active" ] ; then + ErrExit ${EX_CONFIG} "slurmdbd failed to start correctly: ${isactive}" + fi + + # slurmdbd isn't ready immediately to start servicing requests + # if seeing "Connection refused" messages in slurmdbd status, may need to increase this + sleep 3 fi -# slurmdbd isn't ready immediately to start servicing requests -# if seeing "Connection refused" messages in slurmdbd status, may need to increase this -sleep 3 - Rc ErrExit 3 "sacctmgr show cluster -n" trap '' 0 diff --git a/clusters/vc/cfg/vcdb/config/slurm/4.create-cluster-db b/clusters/vc/cfg/vcdb/config/slurm/4.create-cluster-db index 9b05e1b33..b89cb04c7 100755 --- a/clusters/vc/cfg/vcdb/config/slurm/4.create-cluster-db +++ b/clusters/vc/cfg/vcdb/config/slurm/4.create-cluster-db @@ -70,6 +70,8 @@ do fi done +ControlHost=$(grep SlurmctldHost /etc/slurm/slurm.conf | sed -s 's/SlurmctldHost=//' | sed 's/(/ /' | sed 's/)/ /' | awk '{print $1}') +ControlAddr=$(grep SlurmctldHost /etc/slurm/slurm.conf | sed -s 's/SlurmctldHost=//' | sed 's/(/ /' | sed 's/)/ /' | awk '{print $2}') exists=$(sacctmgr show cluster ${CLUSTERNAME} -n -P) if [ -z "${exists}" ] ; then Verbose " creating cluster: ${CLUSTERNAME}" diff --git a/clusters/vc/cfg/vcdb/config/slurm/5.verify-db b/clusters/vc/cfg/vcdb/config/slurm/5.verify-db index c7c554629..4a74179f3 100755 --- a/clusters/vc/cfg/vcdb/config/slurm/5.verify-db +++ b/clusters/vc/cfg/vcdb/config/slurm/5.verify-db @@ -40,8 +40,14 @@ if [ ! -f ${SLURMDBDCONF} ] ; then fi STORAGEUSER=$(grep StorageUser ${SLURMDBDCONF} | sed 's/StorageUser=//') +MYSQL_AUTH="" +if [ -n "${STORAGEUSER}" ] ; then + MYSQL_AUTH="--user=${STORAGEUSER} " +fi STORAGEPASS=$(grep StoragePass ${SLURMDBDCONF} | sed 's/StoragePass=//') -MYSQL_AUTH="--user=${STORAGEUSER} --password=${STORAGEPASS}" +if [ -n "${STORAGEPASS}" ] ; then + MYSQL_AUTH="${MYSQL_AUTH} --password=${STORAGEPASS}" +fi export dbdhost=$(grep -i dbdhost ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdhost=//') export dbdaddr=$(grep -i dbdaddr ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdaddr=//') @@ -53,22 +59,30 @@ if [ -z "${dbdaddr}" ] ; then ErrExit ${EX_SOFTWARE} "empty dbdaddr" fi -MYSQL_CMD="mysql ${MYSQL_AUTH} --host=${dbdhost} --batch" +DBDHost=$(grep AccountingStorageHost= ${SLURMCONF} | sed 's/AccountingStorageHost=//') +MYSQL_CMD="mysql ${MYSQL_AUTH} --batch" +if [ "${DBDHost}" = $(hostname -s) ] ; then + MYSQL_CMD="${MYSQL_CMD} --host=${dbdhost}" + grep StorageUser ${SLURMDBDCONF} +else + MYSQL_CMD="${MYSQL_CMD} --host=${DBDHost}" + dbdhost=${DBDHost} + dbdaddr=$(host ${DBDHost} | awk '{print $4}') +fi Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 1 -n ${dbdhost}" Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 1 -n ${dbdaddr}" - -grep StorageUser ${SLURMDBDCONF} - -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;'" +#XXX Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;'" +timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;' clustername=$(timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'select name from cluster_table;' ) -if [[ ${clustername} != ${CLUSTERNAME} ]] ; then - ErrExit ${EX_SOFTWARE} "select name from cluster_table => ${clustername} != ${CLUSTERNAME}" -fi +#XXX if [[ ${clustername} != ${CLUSTERNAME} ]] ; then +#XXX ErrExit ${EX_SOFTWARE} "select name from cluster_table => ${clustername} != ${CLUSTERNAME}" +#XXX fi -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran" +#XXX Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran" +timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran trap '' 0 exit ${EX_OK} diff --git a/clusters/vc/cfg/vcdb/config/slurm/required.service b/clusters/vc/cfg/vcdb/config/slurm/required.service index 092616d72..5666363b6 100644 --- a/clusters/vc/cfg/vcdb/config/slurm/required.service +++ b/clusters/vc/cfg/vcdb/config/slurm/required.service @@ -1,2 +1 @@ munge -slurmdbd diff --git a/clusters/vc/cfg/vcdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vcdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcdb/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vcdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcdb/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vcdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcdb/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcaltdb/rpm/flagged/WHICH_DB/mariadb-community/add/MariaDB-compart b/clusters/vc/cfg/vcfs/attributes/adddiskpath/size/32 similarity index 100% rename from clusters/vc/cfg/vcaltdb/rpm/flagged/WHICH_DB/mariadb-community/add/MariaDB-compart rename to clusters/vc/cfg/vcfs/attributes/adddiskpath/size/32 diff --git a/clusters/vc/cfg/vcgate/requires/vcdb/2.socket-SLURMDBD b/clusters/vc/cfg/vcgate/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index 1a52c74cf..000000000 --- a/clusters/vc/cfg/vcgate/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vc/cfg/vclogin/config/slurm/5.licenses b/clusters/vc/cfg/vclogin/config/slurm/5.licenses index 5b1ac13cf..ea3be6d11 100755 --- a/clusters/vc/cfg/vclogin/config/slurm/5.licenses +++ b/clusters/vc/cfg/vclogin/config/slurm/5.licenses @@ -62,7 +62,7 @@ do clause=" type=license cluster=${cluster} " suffix=" count=${count} " if [ -n "${existing_licenses}" ] ; then - if [[ "${existing_licenses}" != *"${lic}"*"${cluster}" ]] ; then + if [[ "${existing_licenses}" = ${lic}*${cluster} ]] ; then action="update" clause=" cluster=${cluster} set " suffix="" @@ -83,10 +83,11 @@ do attr_val=$(cat ${d}/${attr_name}) fi if [[ "${existing}" == *"${lic_name}"* ]] ; then - existing_val=$(sacctmgr show resource withcluster where cluster=${cluster} name=${lic_name} -n | awk '{print $5}') + existing_val=$(sacctmgr show resource withcluster where cluster=${cluster} name=${lic_name} -n | awk '{print $7}') if [ "${existing_val}" = "${attr_val}" ] ; then if [ "${attr_val}" -ne 0 ] ; then Verbose "license=${lic_name}, cluster=${cluster}, existing_val:${existing_val} = attr_val:${attr_val}, skipped" + continue fi fi diff --git a/clusters/vc/cfg/vclogin/config/slurm/ipaddr-slurmdbd.%VCDB% b/clusters/vc/cfg/vclogin/config/slurm/ipaddr-slurmdbd.%VCDB% index 86f476c8e..30545bb95 100644 --- a/clusters/vc/cfg/vclogin/config/slurm/ipaddr-slurmdbd.%VCDB% +++ b/clusters/vc/cfg/vclogin/config/slurm/ipaddr-slurmdbd.%VCDB% @@ -1 +1 @@ -%VCDB% +192.168.56.1 diff --git a/clusters/vc/cfg/vclogin/requires/vcdb/2.socket-SLURMDBD b/clusters/vc/cfg/vclogin/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index 1a52c74cf..000000000 --- a/clusters/vc/cfg/vclogin/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vc/cfg/vclogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vclogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vclogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vclogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vclogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vclogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vclogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vclogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vclogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vclogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vclogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vclogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcdb/services/on/slurmdbd b/clusters/vc/cfg/vclogin/rpm/install/cyrus-sasl-lib similarity index 100% rename from clusters/vc/cfg/vcdb/services/on/slurmdbd rename to clusters/vc/cfg/vclogin/rpm/install/cyrus-sasl-lib diff --git a/clusters/vc/cfg/vcsched/requires/vcdb/1.ping b/clusters/vc/cfg/vcsched/requires/vcdb/1.ping deleted file mode 120000 index 4b40dd598..000000000 --- a/clusters/vc/cfg/vcsched/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vc/cfg/vcsched/requires/vcdb/2.socket-SLURMDBD b/clusters/vc/cfg/vcsched/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index 1a52c74cf..000000000 --- a/clusters/vc/cfg/vcsched/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vc/cfg/vcsched/requires/vcdb/3.provisioned b/clusters/vc/cfg/vcsched/requires/vcdb/3.provisioned deleted file mode 120000 index f6c5a84de..000000000 --- a/clusters/vc/cfg/vcsched/requires/vcdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/3.provisioned \ No newline at end of file diff --git a/clusters/vc/cfg/vcsched/requires/vcdb/ipaddr b/clusters/vc/cfg/vcsched/requires/vcdb/ipaddr deleted file mode 120000 index 7805e30d3..000000000 --- a/clusters/vc/cfg/vcsched/requires/vcdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/ipaddr \ No newline at end of file diff --git a/clusters/vc/cfg/vcsched/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/Lmod-8.2.7-1.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/Lmod-8.2.7-1.el7.x86_64.rpm index 32f8dbfdf..6401171e3 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/Lmod-8.2.7-1.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/Lmod-8.2.7-1.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/PyYAML-3.10-11.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/PyYAML-3.10-11.el7.x86_64.rpm index d41f5f711..6fe88a90d 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/PyYAML-3.10-11.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/PyYAML-3.10-11.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/ck-0.5.2-2.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/ck-0.5.2-2.el7.x86_64.rpm index 55320e327..39228b01d 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/ck-0.5.2-2.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/ck-0.5.2-2.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.3-1.el7.noarch.rpm b/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.3-1.el7.noarch.rpm deleted file mode 100644 index 33d8eba31..000000000 --- a/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.3-1.el7.noarch.rpm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d11aa18ddae0756c808369ba58354e13c804a2d2cd565d0901860bdc6784c37f -size 133716 diff --git a/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.4-1.el7.noarch.rpm b/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.4-1.el7.noarch.rpm new file mode 100644 index 000000000..1d848f09a Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/clustershell-1.8.4-1.el7.noarch.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/inotify-tools-3.14-9.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/inotify-tools-3.14-9.el7.x86_64.rpm index 6694e52d5..a66956dc2 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/inotify-tools-3.14-9.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/inotify-tools-3.14-9.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/libaec-1.0.4-1.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/libaec-1.0.4-1.el7.x86_64.rpm index 14b4171d0..78fad1200 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/libaec-1.0.4-1.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/libaec-1.0.4-1.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/libaec-devel-1.0.4-1.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/libaec-devel-1.0.4-1.el7.x86_64.rpm index 02354e44e..fdc491f10 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/libaec-devel-1.0.4-1.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/libaec-devel-1.0.4-1.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-1.14-9.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-1.14-9.el7.x86_64.rpm index ef03811af..ecf00aa8e 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-1.14-9.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-1.14-9.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-clusterlist-hostsfile-1.14-9.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-clusterlist-hostsfile-1.14-9.el7.x86_64.rpm index e804ce06e..a2fd2790d 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-clusterlist-hostsfile-1.14-9.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/libnodeupdown-clusterlist-hostsfile-1.14-9.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/libyaml-0.1.4-11.el7_0.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/libyaml-0.1.4-11.el7_0.x86_64.rpm index 065906117..cb634d3ae 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/libyaml-0.1.4-11.el7_0.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/libyaml-0.1.4-11.el7_0.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-bitop-1.0.2-3.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-bitop-1.0.2-3.el7.x86_64.rpm index f51ba776c..79ffbc687 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-bitop-1.0.2-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-bitop-1.0.2-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-devel-5.1.4-15.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-devel-5.1.4-15.el7.x86_64.rpm new file mode 100644 index 000000000..be520df2f Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/lua-devel-5.1.4-15.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-filesystem-1.6.2-2.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-filesystem-1.6.2-2.el7.x86_64.rpm index e71727436..c8fe3a5df 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-filesystem-1.6.2-2.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-filesystem-1.6.2-2.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-json-1.3.2-2.el7.noarch.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-json-1.3.2-2.el7.noarch.rpm index b36f61103..ac8939403 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-json-1.3.2-2.el7.noarch.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-json-1.3.2-2.el7.noarch.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-lpeg-0.12-1.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-lpeg-0.12-1.el7.x86_64.rpm index c5d0fadfe..896e74213 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-lpeg-0.12-1.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-lpeg-0.12-1.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-posix-32-2.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-posix-32-2.el7.x86_64.rpm index 77d5c9714..c0e09560e 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-posix-32-2.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-posix-32-2.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/lua-term-0.03-3.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/lua-term-0.03-3.el7.x86_64.rpm index 89d1e3e88..6cc7c9621 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/lua-term-0.03-3.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/lua-term-0.03-3.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/luarocks-2.3.0-1.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/luarocks-2.3.0-1.el7.x86_64.rpm index 8dd2be5bb..5bb9c1fc7 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/luarocks-2.3.0-1.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/luarocks-2.3.0-1.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/pdsh-2.34-5.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/pdsh-2.34-5.el7.x86_64.rpm new file mode 100644 index 000000000..cc0cac9fd Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/pdsh-2.34-5.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-dshgroup-2.34-5.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-dshgroup-2.34-5.el7.x86_64.rpm new file mode 100644 index 000000000..838e39af3 Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-dshgroup-2.34-5.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-netgroup-2.34-5.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-netgroup-2.34-5.el7.x86_64.rpm new file mode 100644 index 000000000..6d172b4f4 Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-netgroup-2.34-5.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-nodeupdown-2.34-5.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-nodeupdown-2.34-5.el7.x86_64.rpm new file mode 100644 index 000000000..a70998cbd Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/pdsh-mod-nodeupdown-2.34-5.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/pdsh-rcmd-ssh-2.34-5.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/pdsh-rcmd-ssh-2.34-5.el7.x86_64.rpm new file mode 100644 index 000000000..2d4cea09a Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/pdsh-rcmd-ssh-2.34-5.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/python2-clustershell-1.8.4-1.el7.noarch.rpm b/clusters/vc/cfg/vcsched/rpm/install/python2-clustershell-1.8.4-1.el7.noarch.rpm new file mode 100644 index 000000000..35faa633e Binary files /dev/null and b/clusters/vc/cfg/vcsched/rpm/install/python2-clustershell-1.8.4-1.el7.noarch.rpm differ diff --git a/clusters/vc/cfg/vcsched/rpm/install/whatsup-1.14-9.el7.x86_64.rpm b/clusters/vc/cfg/vcsched/rpm/install/whatsup-1.14-9.el7.x86_64.rpm index ba2da3f82..b382e6dc3 100644 Binary files a/clusters/vc/cfg/vcsched/rpm/install/whatsup-1.14-9.el7.x86_64.rpm and b/clusters/vc/cfg/vcsched/rpm/install/whatsup-1.14-9.el7.x86_64.rpm differ diff --git a/clusters/vc/cfg/vcsvc/config/chrony/3.chrony-waitsync b/clusters/vc/cfg/vcsvc/config/chrony/3.chrony-waitsync index efdd59c34..102dc697a 100755 --- a/clusters/vc/cfg/vcsvc/config/chrony/3.chrony-waitsync +++ b/clusters/vc/cfg/vcsvc/config/chrony/3.chrony-waitsync @@ -21,7 +21,7 @@ if [ -n "${OUT}" ] ; then fi SetFlags >/dev/null 2>&1 -( cd / ; chronyc waitsync ) & +( cd / ; timeout 10 chronyc waitsync ) & trap '' 0 exit ${EX_OK} diff --git a/clusters/vc/common/etc/hosts.%VC-NET% b/clusters/vc/common/etc/hosts.%VC-NET% index 9e38c2b89..28a78319c 100644 --- a/clusters/vc/common/etc/hosts.%VC-NET% +++ b/clusters/vc/common/etc/hosts.%VC-NET% @@ -7,12 +7,14 @@ ## hostonly network: +#10.0.2.2 gw.host-local gw host-gw gw.host ext-db db-ext db.host db.host-local db-host-local db + ### following is used by generateproviderfiles.sh ### 192.168.56 %%%VC-VIRTUALBOX-NET%%% ### ### 192.168.56 %%%VX-VIRTUALBOX-NET%%% ### 192.168.56.0 virtualbox-net0.tc hostonly.tc hostonly hostonly.test-cluster hostonly.testcluster vbox-net -192.168.56.1 gw.vbox.tc gw-vbox gw.vbox.test-cluster gw.vbox.testcluster +192.168.56.1 gw.vbox.tc gw-vbox gw.vbox.test-cluster gw.vbox.testcluster db-host-local db.host-local db.host db ### following is used by generateproviderfiles.sh ### 192.168.78 %%%VC-LIBVIRT-NET%%% ### diff --git a/clusters/vc/common/etc/munge/munge.key b/clusters/vc/common/etc/munge/munge.key index b3904ede1..1be104297 100644 Binary files a/clusters/vc/common/etc/munge/munge.key and b/clusters/vc/common/etc/munge/munge.key differ diff --git a/clusters/vc/common/etc/networks.%VC-NET% b/clusters/vc/common/etc/networks.%VC-NET% index 84ff91c14..45112cfb6 100644 --- a/clusters/vc/common/etc/networks.%VC-NET% +++ b/clusters/vc/common/etc/networks.%VC-NET% @@ -1,5 +1,12 @@ default 0.0.0.0 loopback 127.0.0.0 +loopback-netmask 255.0.0.0 + link-local 169.254.0.0 +link-local-netmask 255.255.0.0 + vc-net %VC-0NET% virtual-cluster-net virtualcluster-net test-cluster-net vx-net +vc-netmask 255.255.255.0 + nat-ext-net 10.0.2.0 nat-external +nat-ext-netmask 255.255.255.0 diff --git a/clusters/vc/common/etc/slurm/slurm.conf.template.%VCSCHED% b/clusters/vc/common/etc/slurm/slurm.conf.template.%VCSCHED% index 8d4188c73..ab468eec6 100644 --- a/clusters/vc/common/etc/slurm/slurm.conf.template.%VCSCHED% +++ b/clusters/vc/common/etc/slurm/slurm.conf.template.%VCSCHED% @@ -1,4 +1,5 @@ SlurmctldHost=vcsched(%VCSCHED%) +SlurmctldAddr=%VCSCHED% AuthType=auth/munge CryptoType=crypto/munge DisableRootJobs=NO @@ -46,6 +47,7 @@ ReturnToService=2 SallocDefaultCommand="srun -n1 -N1 --mem-per-cpu=0 --pty --preserve-env $SHELL" SlurmctldPidFile=/var/run/slurmctld.pid SlurmctldPort=6817 +#SlurmctldParameters=preempt_send_user_signal,max_dbd_msg_action=exit #schedmd#14358 SlurmctldParameters=preempt_send_user_signal SlurmdPidFile=/var/run/slurm/slurmd.pid SlurmdPort=6818 @@ -121,16 +123,16 @@ PriorityWeightQOS=86400 # # LOGGING AND ACCOUNTING AccountingStorageEnforce=associations,limits,qos,safe -AccountingStorageHost=vcdb -AccountingStorageExternalHost=vxdb +AccountingStorageHost=db-host-local +#AccountingStorageExternalHost=db-host-local AccountingStorageLoc=slurm_acct_db #AccountingStoragePass= #AccountingStoragePort= AccountingStorageType=accounting_storage/slurmdbd #AccountingStorageUser= #pre21.08 AccountingStoreJobComment=YES -AccountingStoreFlags=job_comment -# MaxDBDMsgs=Max(MaxJobCount * 2 + Node Count * 4, 10,000) +AccountingStoreFlags=job_comment,job_env,job_script +# default: MaxDBDMsgs=Max(MaxJobCount * 2 + Node Count * 4, 10,000) MaxDBDMsgs=200000 ClusterName=vc DebugFlags=Agent,Backfill,BackfillMap,CPU_Bind,Dependency,License,Network,NodeFeatures,Power,Priority,Reservation,Steps,TraceJobs,Triggers,WorkQueue @@ -195,6 +197,6 @@ PartitionName=login Nodes=vclogin Default=NO State=UP PartitionName=compile Nodes=vcbuild Default=NO State=UP MaxTime=1-00:00:00 PriorityTier=10 PartitionName=exclusive Nodes=vc[1-2] Oversubscribe=EXCLUSIVE Default=NO State=UP DefaultTime=1:00:00 MaxTime=10-00:00:00 PriorityTier=100 PartitionName=shared Nodes=vc[1-2] Oversubscribe=FORCE Default=YES State=UP DefaultTime=1:00:00 MaxTime=90-00:00:00 PriorityTier=1000 -PartitionName=infrastructure Nodes=vcfs,vcsvc,vcdb,vcaltdb,vcsched,vcgate Default=NO State=Down DefaultTime=0:00:01 MaxTime=00:00:01 PriorityTier=0 +PartitionName=infrastructure Nodes=vcfs,vcsvc,vcdb,vcaltdb,vcsched,vcgate Default=NO State=Down DefaultTime=0:00:01 MaxTime=00:00:01 PriorityTier=0 DenyAccounts=ALL DenyQOS=ALL Hidden=YES diff --git a/clusters/vc/common/etc/slurm/slurmdbd.conf.%VCDB% b/clusters/vc/common/etc/slurm/slurmdbd.conf.%VCDB% index f01db99e0..d59c1b4ab 100644 --- a/clusters/vc/common/etc/slurm/slurmdbd.conf.%VCDB% +++ b/clusters/vc/common/etc/slurm/slurmdbd.conf.%VCDB% @@ -1,5 +1,5 @@ -DbdAddr=%VCDB% -DbdHost=vcdb +DbdAddr=192.168.56.1 +DbdHost=db-host-local SlurmUser=root DebugFlags=DB_ASSOC,DB_EVENT,DB_QOS,DB_JOB DebugLevel=debug3 diff --git a/clusters/vc/common/home/sts/.login.turq-slurmdbta b/clusters/vc/common/home/sts/.login.turq-slurmdbta new file mode 100644 index 000000000..eda6c7dba --- /dev/null +++ b/clusters/vc/common/home/sts/.login.turq-slurmdbta @@ -0,0 +1,18 @@ +setenv http_proxy http://proxyout.lanl.gov:8080 +setenv https_proxy http://proxyout.lanl.gov:8080 +setenv proxy http://proxyout.lanl.gov:8080 + +setenv SLURM_CONF /etc/slurm/slurm.conf.vc + +pushd ~/hpc-collab/http-repo +source bin/setpath.csh +mkdir -p /tmp/tarballs +mkdir -p /tmp/VirtualBox\ VMs +pushd clusters/vc +make Vagrantfile +cd ../vx +make Vagrantfile +show +popd + + diff --git a/clusters/vc/common/provision/config/slurm/1.slurm-dirs b/clusters/vc/common/provision/config/slurm/1.slurm-dirs index e7f3e818c..399d41b35 100755 --- a/clusters/vc/common/provision/config/slurm/1.slurm-dirs +++ b/clusters/vc/common/provision/config/slurm/1.slurm-dirs @@ -17,19 +17,21 @@ declare -x OUT=${1:-""} if [ -n "${OUT}" ] ; then touch ${OUT} || exit 1 + exec > >(tee -a "${OUT}") 2>&1 fi -exec > >(tee -a "${OUT}") 2>&1 - declare -x ETC=/etc declare -x VARLOGSLURM=/var/log/slurm declare -x VARSPOOLSLURM=/var/spool/slurm declare -x COMMONVARLOGSLURM=${COMMON}${VARLOGSLURM} +declare -x VARSPOOLSLURMHOST=${VARSPOOLSLURM}/$(hostname -s) if [ ! -L ${VARLOGSLURM} ] ; then Rc ErrExit 2 "ln -s ${COMMONVARLOGSLURM} ${VARLOGSLURM}" fi -Rc ErrExit 3 "mkdir -p ${VARSPOOLSLURM}/$(hostname -s)" +if [ ! -d ${VARSPOOLSLURMHOST} ] ; then + Rc ErrExit 3 "mkdir -p ${VARSPOOLSLURMHOST}" +fi trap '' 0 exit ${EX_OK} diff --git a/clusters/vc/common/provision/install/slurm-spank-lua/version b/clusters/vc/common/provision/install/slurm-spank-lua/version index 751b1ea05..4911aab39 100644 --- a/clusters/vc/common/provision/install/slurm-spank-lua/version +++ b/clusters/vc/common/provision/install/slurm-spank-lua/version @@ -1 +1 @@ -0.39 +0.45 diff --git a/clusters/vx/cfg/vx1/requires/vcdb/1.ping b/clusters/vx/cfg/vx1/requires/vcdb/1.ping deleted file mode 120000 index d4984f900..000000000 --- a/clusters/vx/cfg/vx1/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vcdb/2.socket-SLURMDBD b/clusters/vx/cfg/vx1/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index d781988ed..000000000 --- a/clusters/vx/cfg/vx1/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vcdb/3.provisioned b/clusters/vx/cfg/vx1/requires/vcdb/3.provisioned deleted file mode 120000 index e1f9cd582..000000000 --- a/clusters/vx/cfg/vx1/requires/vcdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vcdb/ipaddr b/clusters/vx/cfg/vx1/requires/vcdb/ipaddr deleted file mode 120000 index 0fe7d80f4..000000000 --- a/clusters/vx/cfg/vx1/requires/vcdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vxdb/1.ping b/clusters/vx/cfg/vx1/requires/vxdb/1.ping deleted file mode 120000 index f44be12eb..000000000 --- a/clusters/vx/cfg/vx1/requires/vxdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vxdb/2.socket-SLURMDBD b/clusters/vx/cfg/vx1/requires/vxdb/2.socket-SLURMDBD deleted file mode 120000 index cf9bd4b02..000000000 --- a/clusters/vx/cfg/vx1/requires/vxdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vxdb/3.provisioned b/clusters/vx/cfg/vx1/requires/vxdb/3.provisioned deleted file mode 120000 index bc345e805..000000000 --- a/clusters/vx/cfg/vx1/requires/vxdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/requires/vxdb/ipaddr b/clusters/vx/cfg/vx1/requires/vxdb/ipaddr deleted file mode 120000 index 53db67b2d..000000000 --- a/clusters/vx/cfg/vx1/requires/vxdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vx1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vx/cfg/vx1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx1/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vx1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vx/cfg/vx1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx1/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vx1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vx/cfg/vx1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx1/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vx2/requires/vcdb/1.ping b/clusters/vx/cfg/vx2/requires/vcdb/1.ping deleted file mode 120000 index d4984f900..000000000 --- a/clusters/vx/cfg/vx2/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vcdb/2.socket-SLURMDBD b/clusters/vx/cfg/vx2/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index d781988ed..000000000 --- a/clusters/vx/cfg/vx2/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vcdb/3.provisioned b/clusters/vx/cfg/vx2/requires/vcdb/3.provisioned deleted file mode 120000 index e1f9cd582..000000000 --- a/clusters/vx/cfg/vx2/requires/vcdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vcdb/ipaddr b/clusters/vx/cfg/vx2/requires/vcdb/ipaddr deleted file mode 120000 index 0fe7d80f4..000000000 --- a/clusters/vx/cfg/vx2/requires/vcdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vxdb/1.ping b/clusters/vx/cfg/vx2/requires/vxdb/1.ping deleted file mode 120000 index f44be12eb..000000000 --- a/clusters/vx/cfg/vx2/requires/vxdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vxdb/2.socket-SLURMDBD b/clusters/vx/cfg/vx2/requires/vxdb/2.socket-SLURMDBD deleted file mode 120000 index cf9bd4b02..000000000 --- a/clusters/vx/cfg/vx2/requires/vxdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vxdb/3.provisioned b/clusters/vx/cfg/vx2/requires/vxdb/3.provisioned deleted file mode 120000 index bc345e805..000000000 --- a/clusters/vx/cfg/vx2/requires/vxdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/requires/vxdb/ipaddr b/clusters/vx/cfg/vx2/requires/vxdb/ipaddr deleted file mode 120000 index 53db67b2d..000000000 --- a/clusters/vx/cfg/vx2/requires/vxdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vx2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vx/cfg/vx2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx2/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vx2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vx/cfg/vx2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx2/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vx2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vx2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vx/cfg/vx2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vx2/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vxdb/config/firewall/1.set-ports-services-zones b/clusters/vx/cfg/vxdb/config/firewall/1.set-ports-services-zones deleted file mode 120000 index 959e6bf71..000000000 --- a/clusters/vx/cfg/vxdb/config/firewall/1.set-ports-services-zones +++ /dev/null @@ -1 +0,0 @@ -/home/vagrant/common/provision/config/firewall/1.set-ports-services-zones \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/firewall/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/firewall/RPMS.Manifest deleted file mode 120000 index 963863742..000000000 --- a/clusters/vx/cfg/vxdb/config/firewall/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -/home/vagrant/common/provision/config/firewall/RPMS.Manifest \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/munge/1.munge-file-permissions-first-run-preconfiguration b/clusters/vx/cfg/vxdb/config/munge/1.munge-file-permissions-first-run-preconfiguration deleted file mode 100755 index 85112eb8f..000000000 --- a/clusters/vx/cfg/vxdb/config/munge/1.munge-file-permissions-first-run-preconfiguration +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcbuild/config/munge/1.munge-files-permissions - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x ETC=/etc -declare -x ETCMUNGE=${ETC}/munge -declare -x ETCMUNGEKEY=${ETCMUNGE}/munge.key -declare -x VARLOGMUNGE=/var/log/munge -declare -x MUNGEDLOG=${VARLOGMUNGE}/munged.log - -declare -x COMMONETC=${COMMON}${ETC} -declare -x COMMONETCMUNGE=${COMMON}${ETCMUNGE} -declare -x COMMONETCMUNGEKEY=${COMMONETCMUNGE}/munge.key - - -# stop any prior instances of munge - -svc_pid=$(ps ax | grep -v grep | grep munged|awk '{print $1}') -if [ -n "${svc_pid}" ] ; then - kill -1 ${svc_pid} - - for sig in 15 9 - do - sleep 1 - svc_pid=$(ps ax | grep -v grep | grep munged | awk '{print $1}') - if [ -n "${svc_pid}" ] ; then - kill -s 0 ${svc_pid} && \ - kill -${sig} ${svc_pid} - fi - done -fi - -Rc ErrExit ${EX_OSFILE} "touch ${MUNGEDLOG}" -Rc ErrExit ${EX_OSFILE} "cmp ${COMMONETCMUNGEKEY} ${ETCMUNGEKEY} || cp ${COMMONETCMUNGEKEY} ${ETCMUNGEKEY}" -Rc ErrExit ${EX_OSFILE} "chmod 0400 ${ETCMUNGEKEY}" - -# reset permissions (to munge:munge) so that systemd-initiated service starts correctly - -for f in / /home ${HOMEVAGRANT} ${COMMON} ${COMMONETC} ${MUNGEDLOG} /var /var/log ${VARLOGMUNGE} \ - /var/run/munge /var/lib /var/lib/munge /var/lib/munge/munge.seed \ - ${COMMONETCMUNGE} ${ETCMUNGE} ${ETCMUNGEKEY} -do - ch_args="" - if [ -L ${f} ] ; then - ch_args="-h" - fi - if [ -f ${f} -o -d ${f} ] ; then - Rc ErrExit ${EX_OSFILE} "chown ${ch_args} root:root ${f}" - Rc ErrExit ${EX_OSFILE} "chmod g-w ${f}" - else - Rc ErrExit ${EX_OSFILE} "touch ${f}" - fi -done - -for f in /var/run/munge/munged.pid -do - target="" - if [ -L "${f}" ] ; then - target=$(readlink ${f}) - fi - for x in ${f} ${target} - do - ch_arg="" - if [ -d "${x}" -o -f "${x}" -o -L "${x}" ] ; then - if [ -L ${x} ] ; then - ch_arg="-h" - fi - if [[ ${f} = *munge* ]] ; then - Rc ErrExit ${EX_OSFILE} "chown ${ch_arg} munge:munge ${x}" - else - Rc ErrExit ${EX_OSFILE} "chown ${ch_arg} root:root ${x}" - fi - fi - done -done - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/munge/2.overlay-munge-service b/clusters/vx/cfg/vxdb/config/munge/2.overlay-munge-service deleted file mode 100755 index 4a64b8ee5..000000000 --- a/clusters/vx/cfg/vxdb/config/munge/2.overlay-munge-service +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcbuild/config/munge/2.overlay-munge-service - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x USRLIB_SYSTEMDSYSTEM=/usr/lib/systemd/system -declare -x MUNGE_SERVICE=${USRLIB_SYSTEMDSYSTEM}/munge.service -declare -x ROOTFS_MUNGE_SERVICE=${ROOTFS}/${MUNGE_SERVICE} -declare -x COMMON_MUNGE_SERVICE=${COMMON}/${MUNGE_SERVICE} - -Rc ErrExit ${EX_OSFILE} "mv ${MUNGE_SERVICE} ${MUNGE_SERVICE}~" -Rc ErrExit ${EX_OSFILE} "ln -s ${COMMON_MUNGE_SERVICE} ${MUNGE_SERVICE}" -if [ ! -f ${MUNGE_SERVICE} -o ! -s ${MUNGE_SERVICE} ] ; then - ErrExit ${EX_OSERR} "MUNGE_SERVICE: ${MUNGE_SERVICE} empty" -fi -Rc ErrExit 10 "systemctl daemon-reload" - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/munge/3.force-munge-service-on b/clusters/vx/cfg/vxdb/config/munge/3.force-munge-service-on deleted file mode 100755 index 244aeb40c..000000000 --- a/clusters/vx/cfg/vxdb/config/munge/3.force-munge-service-on +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/config/munge/3.force-munge-service-on - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x VARLOGMUNGE=/var/log/munge -declare -x VARLOGMUNGE_LOG=${VARLOGMUNGE}/munged.log -declare -x MUNGE_DAEMON=/usr/sbin/munged - -Rc ErrExit ${EX_OSFILE} "touch ${VARLOGMUNGE_LOG}" -Rc ErrExit ${EX_SOFTWARE} "${MUNGE_DAEMON}" - -svc=$(ps ax | grep -v grep | grep munged) -if ! [[ ${svc} =~ munged ]] ; then - if [ -s ${VARLOGMUNGE_LOG} ] ; then - echo --- - cat ${VARLOGMUNGE_LOG} - echo --- - fi - ErrExit ${EX_SOFTWARE} "munged did not start" -fi - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/munge/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/munge/RPMS.Manifest deleted file mode 100644 index 5666363b6..000000000 --- a/clusters/vx/cfg/vxdb/config/munge/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -munge diff --git a/clusters/vx/cfg/vxdb/config/mysql/1.query-MYSQL b/clusters/vx/cfg/vxdb/config/mysql/1.query-MYSQL deleted file mode 100755 index 978e09cb5..000000000 --- a/clusters/vx/cfg/vxdb/config/mysql/1.query-MYSQL +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vc*/.../requires/vcdb/3.query-MYSQL -## - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x ETCSLURM=/etc/slurm -declare -x SLURMDBDCONF=${ETCSLURM}/slurmdbd.conf -declare -x COMMON_ROOT=/home/vx/common/root -declare -x MYSQL_PW_F=${COMMON_ROOT}/mysql_pw -declare -x SLURMDBDCONF=/home/vx/common/${ETCSLURM}/slurmdbd.conf - -declare -x MYSQL=$(which mysql) -MYSQL=$(which mysql) - -if [ ! -x "${MYSQL}" ] ; then - ErrExit ${EX_SOFTWARE} "mysql client is not executable: ${mysql}" -fi - -Rc ErrExit ${EX_SOFTWARE} "test -f ${SLURMDBDCONF}" - -STORAGEHOST=$(grep StorageHost ${SLURMDBDCONF} | sed 's/StorageHost=//') -STORAGEUSER=$(grep StorageUser ${SLURMDBDCONF} | sed 's/StorageUser=//') - -if [ ! -s "${MYSQL_PW_F}" ] ; then - ErrExit ${EX_SOFTWARE} "MYSQL_PW_F:${MYSQL_PW_F} is missing or empty" -fi -STORAGEPASS=$(cat ${MYSQL_PW_F}) - -for _v in STORAGEUSER STORAGEPASS STORAGEHOST -do - if [ -z "${!_v}" ] ; then - ErrExit ${EX_SOFTWARE} "${_v}:${!_v} missing or empty" - fi -done - -grep -q -e StoragePass ${SLURMDBDCONF} >/dev/null 2>&1 -rc=$? -if [ ${rc} -eq ${GREP_NOTFOUND} ] ; then - Warn ${EX_CONFIG} " Note: StoragePass not found in slurmdbd.conf:${SLURMDBDCONF}" - Rc ErrExit ${EX_SOFTWARE} "sed -i /^StorageUser=/a\ -StoragePass=${STORAGEPASS} ${SLURMDBDCONF}" -fi - -DBDHOST=$(grep DbdHost ${SLURMDBDCONF} | sed 's/DbdHost=//') -HOSTNAME=${HOSTNAME:-$(hostname -s)} -CL=${HOSTNAME:0:2} -_S="" -for _s in STORAGEHOST DBDHOST -do - if [ -n "${_S}" ] ; then - break - fi - - if [ "${!_s}" != "localhost" ] ; then - _S=${!_s} - fi -done -if [ -z "${_S}" ] ; then - ErrExit ${EX_CONFIG} "STORAGEHOST:${STORAGEHOST} is unusable for a conjoined cluster:${CL}" -fi -STORAGEHOST="${_S}" - -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 0.1 -w 0.1 -n ${STORAGEHOST}" -MYSQL_AUTH="--user=${STORAGEUSER} --password=${STORAGEPASS}" -MYSQL_CMD="${MYSQL} ${MYSQL_AUTH} --host=${STORAGEHOST} --batch" - -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;'" - -exit ${EX_OK} - -# vim: background=dark ts=2 sw=2 syntax=sh diff --git a/clusters/vx/cfg/vxdb/config/nfs/1.monitor-for-estale b/clusters/vx/cfg/vxdb/config/nfs/1.monitor-for-estale deleted file mode 120000 index c0ec2b31f..000000000 --- a/clusters/vx/cfg/vxdb/config/nfs/1.monitor-for-estale +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/nfs/1.monitor-for-estale \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/nfs/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/nfs/RPMS.Manifest deleted file mode 120000 index 500454451..000000000 --- a/clusters/vx/cfg/vxdb/config/nfs/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/nfs/RPMS.Manifest \ No newline at end of file diff --git "a/clusters/vx/cfg/vxdb/config/perf-kvm/1.config-\342\210\225proc\342\210\225nodename" "b/clusters/vx/cfg/vxdb/config/perf-kvm/1.config-\342\210\225proc\342\210\225nodename" deleted file mode 120000 index b1a8b5bb7..000000000 --- "a/clusters/vx/cfg/vxdb/config/perf-kvm/1.config-\342\210\225proc\342\210\225nodename" +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/perf-kvm/1.config-∕proc∕nodename \ No newline at end of file diff --git "a/clusters/vx/cfg/vxdb/config/perf-kvm/2.cp-\342\210\225proc\342\210\225kallsyms,modules" "b/clusters/vx/cfg/vxdb/config/perf-kvm/2.cp-\342\210\225proc\342\210\225kallsyms,modules" deleted file mode 120000 index 463fb4bf6..000000000 --- "a/clusters/vx/cfg/vxdb/config/perf-kvm/2.cp-\342\210\225proc\342\210\225kallsyms,modules" +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/perf-kvm/2.cp-∕proc∕kallsyms,modules \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/perf-kvm/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/perf-kvm/RPMS.Manifest deleted file mode 120000 index d57267388..000000000 --- a/clusters/vx/cfg/vxdb/config/perf-kvm/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/perf-kvm/RPMS.Manifest \ No newline at end of file diff --git "a/clusters/vx/cfg/vxdb/config/rsyslog/1.config-var\342\210\225log\342\210\225rsyslog\342\210\225nodename" "b/clusters/vx/cfg/vxdb/config/rsyslog/1.config-var\342\210\225log\342\210\225rsyslog\342\210\225nodename" deleted file mode 120000 index f1a5f5500..000000000 --- "a/clusters/vx/cfg/vxdb/config/rsyslog/1.config-var\342\210\225log\342\210\225rsyslog\342\210\225nodename" +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/1.config-var∕log∕rsyslog∕nodename \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/rsyslog/2.rsyslog.conf b/clusters/vx/cfg/vxdb/config/rsyslog/2.rsyslog.conf deleted file mode 120000 index 81438f790..000000000 --- a/clusters/vx/cfg/vxdb/config/rsyslog/2.rsyslog.conf +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/2.rsyslog.conf \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/rsyslog/3.semanage-permissive-syslogd_t b/clusters/vx/cfg/vxdb/config/rsyslog/3.semanage-permissive-syslogd_t deleted file mode 120000 index f683c819d..000000000 --- a/clusters/vx/cfg/vxdb/config/rsyslog/3.semanage-permissive-syslogd_t +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/3.semanage-permissive-syslogd_t \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/rsyslog/4.restart-service b/clusters/vx/cfg/vxdb/config/rsyslog/4.restart-service deleted file mode 120000 index f6f420c4f..000000000 --- a/clusters/vx/cfg/vxdb/config/rsyslog/4.restart-service +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/4.restart-service \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/rsyslog/5.syslog-logrotate b/clusters/vx/cfg/vxdb/config/rsyslog/5.syslog-logrotate deleted file mode 120000 index 69a45c1da..000000000 --- a/clusters/vx/cfg/vxdb/config/rsyslog/5.syslog-logrotate +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/5.syslog-logrotate \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/rsyslog/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/rsyslog/RPMS.Manifest deleted file mode 120000 index 3a79f0dcd..000000000 --- a/clusters/vx/cfg/vxdb/config/rsyslog/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/config/rsyslog/RPMS.Manifest \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/slurm/1.slurm-dirs b/clusters/vx/cfg/vxdb/config/slurm/1.slurm-dirs deleted file mode 120000 index e6c424999..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/1.slurm-dirs +++ /dev/null @@ -1 +0,0 @@ -/home/vagrant/common/provision/config/slurm/1.slurm-dirs \ No newline at end of file diff --git "a/clusters/vx/cfg/vxdb/config/slurm/2.copyin-\342\210\225etc\342\210\225slurm" "b/clusters/vx/cfg/vxdb/config/slurm/2.copyin-\342\210\225etc\342\210\225slurm" deleted file mode 120000 index 560b6a892..000000000 --- "a/clusters/vx/cfg/vxdb/config/slurm/2.copyin-\342\210\225etc\342\210\225slurm" +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/early-slurm/1.copyin-∕etc∕slurm \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/slurm/3.create-slurm.conf-resize-node-memory-from-attr b/clusters/vx/cfg/vxdb/config/slurm/3.create-slurm.conf-resize-node-memory-from-attr deleted file mode 120000 index 8b92b56b0..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/3.create-slurm.conf-resize-node-memory-from-attr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/early-slurm/2.create-slurm.conf-resize-node-memory-from-attr \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/slurm/4.check-slurmdbd-conf b/clusters/vx/cfg/vxdb/config/slurm/4.check-slurmdbd-conf deleted file mode 100755 index 117f7ce0b..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/4.check-slurmdbd-conf +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/install/slurm/2.check-slurmdbd-config - -## @brief start slurmdbd service early - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -ETCSLURM=/etc/slurm -SLURMDBD_CONF=${ETCSLURM}/slurmdbd.conf -SLURM_CONF=${ETCSLURM}/slurm.conf -VARLOGSLURM=/var/log/slurm -VARLOGSLURM_LINK=$(readlink ${VARLOGSLURM}) - -for _v in SLURM_CONF SLURMDBD_CONF -do - if [ ! -f "${!_v}" ] ; then - ErrExit ${EX_CONFIG} "${_v}:${!_v} missing" - fi - - if [ ! -s "${!_v}" ] ; then - ErrExit ${EX_CONFIG} "${_v}:${!_v} empty" - fi -done - -SLURMDBD_LOG=$(grep LogFile=${VARLOGSLURM} ${SLURMDBD_CONF} | sed 's:LogFile=::') - -if [ ! -L ${VARLOGSLURM} ] ; then - ErrExit ${EX_CONFIG} "VARLOGSLURM:${VARLOGSLURM} is not a symlink" -fi - -if [ ! -d ${VARLOGSLURM_LINK} ] ; then - ErrExit ${EX_CONFIG} "VARLOGSLURM_LINK:${VARLOGSLURM_LINK} is not a directory" -fi - -Rc ErrExit ${EX_OSFILE} "printf '\n--- %s %s ---\n' ${HOSTNAME} $(basename $0) >> ${SLURMDBD_LOG}" - -SlurmUser=$(grep SlurmUser ${SLURMDBD_CONF} | sed 's/SlurmUser=//') -Rc ErrExit ${EX_OSFILE} "chmod 0600 ${SLURMDBD_CONF}" -Rc ErrExit ${EX_OSFILE} "chown ${SlurmUser}:${SlurmUser} ${SLURMDBD_CONF}" - -trap '' 0 -exit ${EX_OK} - -# vim: background=dark ts=2 sw=2 syntax diff --git a/clusters/vx/cfg/vxdb/config/slurm/5.fix20.11-config b/clusters/vx/cfg/vxdb/config/slurm/5.fix20.11-config deleted file mode 120000 index bfed3a1e4..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/5.fix20.11-config +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/early-slurm/3a.fix20.11-config \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/slurm/6.mkdir-slurm-prolog.d b/clusters/vx/cfg/vxdb/config/slurm/6.mkdir-slurm-prolog.d deleted file mode 120000 index 15abb8853..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/6.mkdir-slurm-prolog.d +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/early-slurm/3.mkdir-slurm-prolog.d \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/slurm/7.start-slurmdbd-service b/clusters/vx/cfg/vxdb/config/slurm/7.start-slurmdbd-service deleted file mode 100755 index 004f72609..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/7.start-slurmdbd-service +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/install/slurm/7.start-slurmdbd-service - -## @brief start slurmdbd service early - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -SetFlags >/dev/null 2>&1 - -ETCSLURM=/etc/slurm -SLURMDBD_CONF=${ETCSLURM}/slurmdbd.conf -SLURM_CONF=${ETCSLURM}/slurm.conf -VARLOGSLURM=/var/log/slurm -VARLOGSLURM_LINK=$(readlink ${VARLOGSLURM}) -HOSTNAME=${HOSTNAME:-$(hostname -s)} -REQUIRED_PROC_FILE=${PWD}/required.service - -for _v in SLURM_CONF SLURMDBD_CONF REQUIRED_PROC_FILE -do - if [ ! -f "${!_v}" ] ; then - ErrExit ${EX_CONFIG} "${_v}:${!_v} missing" - fi - - if [ ! -s "${!_v}" ] ; then - ErrExit ${EX_CONFIG} "${_v}:${!_v} empty" - fi -done - -SLURMDBD_LOG=$(grep LogFile=${VARLOGSLURM} ${SLURMDBD_CONF} | sed 's:LogFile=::') -SLURMDBD_HOST=$(echo ${SLURMDBD_LOG} | sed s:${VARLOGSLURM}/slurmdbd.:: | sed s:\.log$::) -if [ "${SLURMDBD_HOST}" != "${HOSTNAME}" ] ; then - grep AccountingStorageHost=${HOSTNAME} ${SLURM_CONF} 2>&1 - rc=$? - if [ "${rc}" -eq "${GREP_FOUND}" ] ; then - ErrExit ${EX_CONFIG} "Misconfiguration: slurm.conf AccountingStorageHost != slurmdbd.conf DbdHost" - fi - Verbose " slurmdbd is not configured on this host ($HOSTNAME), SLURMDBD_HOST:${SLURMDBD_HOST}" - Rc ErrExit ${EX_CONFIG} "sed -i~ /slurmdbd/d ${REQUIRED_PROC_FILE}" -else - isactive=$(systemctl status slurmdbd | awk '/Active:/ {print $2}') - if [ "${isactive}" != "active" ] ; then - Rc ErrExit 3 "systemctl start slurmdbd" - sleep 1 - fi - - isactive=$(systemctl status slurmdbd | awk '/Active:/ {print $2}') - if [ "${isactive}" != "active" ] ; then - ErrExit ${EX_CONFIG} "slurmdbd failed to start correctly: ${isactive}" - fi -fi - -# slurmdbd isn't ready immediately to start servicing requests -# if seeing "Connection refused" messages in slurmdbd status, may need to increase this -sleep 1 - -HOSTNAME=${HOSTNAME:-$(hostname -s)} -Rc ErrExit 10 "sacctmgr show cluster -n" - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/slurm/8.create-cluster-db b/clusters/vx/cfg/vxdb/config/slurm/8.create-cluster-db deleted file mode 100755 index 62139aab6..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/8.create-cluster-db +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -vx - -## $Header: $ -## Source: -## @file vcdb/config/slurm/1.create-cluster-db - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -SetFlags >/dev/null 2>&1 - -declare -x ETCSLURM=/etc/slurm -declare -x SLURMCONF=${ETCSLURM}/slurm.conf -declare -x REQUIRED_PROC_FILE=${PWD}/required.service - -if [ -z "${SLURMCONF}" ] ; then - ErrExit ${EX_OSFILE} "empty SLURMCONF" -fi -if [ ! -f ${SLURMCONF} ] ; then - ErrExit ${EX_OSFILE} "SLURMCONF: ${SLURMCONF} nonexistent" -fi - -CLUSTERNAME=$(grep ClusterName ${SLURMCONF} | sed 's/ClusterName=//') -rc=$? - -if [ ${rc} -ne ${GREP_FOUND} ] ; then - ErrExit ${EX_OSFILE} "ClusterName not found in ${SLURMCONF}" -fi - -if [ ! -f ${REQUIRED_PROC_FILE} -o -z ${REQUIRED_PROC_FILE} ] ; then - ErrExit ${EX_OSFILE} "empty or missing REQUIRED_PROC_FILE: ${REQUIRED_PROC_FILE}" -fi - -services=$(echo $(cat ${REQUIRED_PROC_FILE})) - -if [ -z "${services}" ] ; then - ErrExit ${EX_OSERR} "no required services specified in {REQUIRED_PROC_FILE}?" -fi - -for _s in ${services} -do - ps_running=$(systemctl status ${_s} | grep -v grep | grep 'Active: active (running)') - echo ${_s} - if [ -z "${ps_running}" ] ; then - echo "required ${_s} service not active" - echo '---' - systemctl status ${_s} - echo '---' - ps_out=$(ps ax | grep ${_s} | grep -v grep) - if [ -z "${ps_out}" ] ; then - echo --- - echo ${ps_out} - echo --- - ErrExit ${EX_OSERR} "daemon \"${_s}\" not running" - else - pid=$(echo ${ps_out} | awk '{print $1}') - echo "${_s}, pid: ${pid}" - fi - fi -done - -exists=$(sacctmgr show cluster ${CLUSTERNAME} -n -P) -if [ -z "${exists}" ] ; then - Verbose " creating cluster: ${CLUSTERNAME}" - db_cluster=$(echo $(sacctmgr -iQ create cluster ${CLUSTERNAME})) - # "Adding Cluster(s) Name = ${CLUSTERNAME}" -else - Verbose " preexisting cluster: ${CLUSTERNAME}" -fi - -db_cluster=$(sacctmgr show cluster ${CLUSTERNAME} -p -n | tail -1 | awk -F\| '{print $1}') -echo "db_cluster (sacctmgr show cluster): \"${db_cluster}\"" -if [ -z "${db_cluster}" ] ; then - ErrExit ${EX_OSERR} "sacctmgr show cluster \"${CLUSTERNAME}\" failed" -fi - -if [[ ${db_cluster} != ${CLUSTERNAME} ]] ; then - ErrExit ${EX_OSERR} "sacctmgr show cluster: \"${db_cluster}\" != \"${CLUSTERNAME}\"" -fi - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/slurm/90.verify-db b/clusters/vx/cfg/vxdb/config/slurm/90.verify-db deleted file mode 100755 index d2e0326fc..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/90.verify-db +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/config/slurm/90.verify-db - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x ETCSLURM=/etc/slurm -declare -x SLURMCONF=${ETCSLURM}/slurm.conf -declare -x SLURMDBDCONF=${ETCSLURM}/slurmdbd.conf - -if [ ! -f ${SLURMCONF} ] ; then - ErrExit ${EX_SOFTWARE} "SLURMCONF:${SLURMCONF} file not found" -fi - -CLUSTERNAME=$(grep ClusterName ${SLURMCONF} | sed 's/ClusterName=//') -rc=$? -echo "slurm.conf: ClusterName=\"${CLUSTERNAME}\"" -if [ ${rc} -ne ${GREP_FOUND} ] ; then - ErrExit ${EX_SOFTWARE} "SLURMCONF:${SLURMCONF} ClusterName not found" -fi - -if [ ! -f ${SLURMDBDCONF} ] ; then - ErrExit ${EX_SOFTWARE} "SLURMDBDCONF:${SLURMDBDCONF} file not found" -fi - -STORAGEHOST=$(grep StorageHost ${SLURMDBDCONF} | sed 's/StorageHost=//') -STORAGEUSER=$(grep StorageUser ${SLURMDBDCONF} | sed 's/StorageUser=//') -STORAGEPASS=$(grep StoragePass ${SLURMDBDCONF} | sed 's/StoragePass=//') -DBDHOST=$(grep DbdHost ${SLURMDBDCONF} | sed 's/DbdHost=//') - -MYSQL_AUTH="--user=${STORAGEUSER}" -if [ -z "${STORAGEPASS}" ] ; then - - Warn ${EX_CONFIG} "STORAGEPASS empty" -else - MYSQL_AUTH="--user=${MYSQL_AUTH} --password=${STORAGEPASS}" -fi - -export dbdhost=$(grep -i dbdhost ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdhost=//') -export dbdaddr=$(grep -i dbdaddr ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdaddr=//') - -if [ -z "${dbdhost}" ] ; then - ErrExit ${EX_SOFTWARE} "empty dbdhost" -fi -if [ -z "${dbdaddr}" ] ; then - ErrExit ${EX_SOFTWARE} "empty dbdaddr" -fi - -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 0.1 -w 0.1 -n ${STORAGEHOST}" - -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 0.1 -w 0.1 -n ${dbdhost}" -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 0.1 -w 0.1 -n ${dbdaddr}" - -if [ "${DBDHOST}" = "${HOSTNAME}" -o "${STORAGEHOST}" = "${HOSTNAME}" ] ; then - MYSQL_CMD="mysql ${MYSQL_AUTH} --host=${STORAGEHOST} --batch" - Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;'" - clusternames=$(timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute "select name from cluster_table;" ) - - if [ -z "${clusternames}" ] ; then - ErrExit ${EX_SOFTWARE} "slurm_acct_db.cluster_table has no entries" - fi - found="" - for _c in ${clusternames} - do - if [ "${_c}" = "${CLUSTERNAME}" ] ; then - found="${_c}" - break; - fi - done - if [ -z "${found}" ] ; then - ErrExit ${EX_SOFTWARE} "Cluster name \'${CLUSTERNAME}\' not found in slurm_acct_db.cluster_table" - fi - - Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran" -fi - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/slurm/91.reconfigure-munge-file-permissions-for-systemd b/clusters/vx/cfg/vxdb/config/slurm/91.reconfigure-munge-file-permissions-for-systemd deleted file mode 100755 index f83b7f844..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/91.reconfigure-munge-file-permissions-for-systemd +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/config/slurm/3.reconfigure-munge-for-normal-operation - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x ETC=/etc -declare -x ETCMUNGE=${ETC}/munge -declare -x COMMONETC=${COMMON}${ETC} -declare -x COMMONETCMUNGE=${COMMON}${ETCMUNGE} - -set -e -svc_pid=$(ps ax | grep -v grep | grep munged|awk '{print $1}') -if [ -n "${svc_pid}" ] ; then - kill -1 ${svc_pid} 2>&1 >/dev/null -fi - -for sig in 15 9 -do - sleep 1 - svc_pid=$(ps ax | grep -v grep | grep munged | awk '{print $1}') - if [ -n "${svc_pid}" ] ; then - if [[ ${svc_pid} =~ "^[0-9]+$" ]] ; then - kill -s 0 ${svc_pid} && \ - kill -${sig} ${svc_pid} - fi - pkill --signal ${sig} munged - fi -done - -Rc ErrExit ${EX_OSFILE} "chown root:root /var /var/log" - -# reset permissions (to munge:munge) so that systemd-initiated service starts correctly -for f in /var/log/munge /var/log/munge/munged.log \ - /var/run/munge/munged.pid /var/run/munge \ - /var/lib/munge /var/lib/munge/munge.seed \ - /etc/munge /etc/munge/munge.key -do - target="" - if [ -L "${f}" ] ; then - target=$(readlink ${f}) - fi - for x in ${f} ${target} - do - ch_arg="" - if [ -d "${x}" -o -f "${x}" -o -L "${x}" ] ; then - if [ -L ${x} ] ; then - ch_arg="-h" - fi - Rc ErrExit ${EX_OSFILE} "chown ${ch_arg} munge:munge ${x}" - Rc ErrExit ${EX_OSFILE} "chmod g-w ${x}" - fi - done -done - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/config/slurm/required.service b/clusters/vx/cfg/vxdb/config/slurm/required.service deleted file mode 100644 index 092616d72..000000000 --- a/clusters/vx/cfg/vxdb/config/slurm/required.service +++ /dev/null @@ -1,2 +0,0 @@ -munge -slurmdbd diff --git a/clusters/vx/cfg/vxdb/config/ssh/1.sshd-config b/clusters/vx/cfg/vxdb/config/ssh/1.sshd-config deleted file mode 120000 index fa5a86fed..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/1.sshd-config +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/1.sshd-config \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/2.copy-common-root-keys b/clusters/vx/cfg/vxdb/config/ssh/2.copy-common-root-keys deleted file mode 120000 index bcde682cd..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/2.copy-common-root-keys +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/2.copy-common-root-keys \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/3.merge-host-keys-to-common b/clusters/vx/cfg/vxdb/config/ssh/3.merge-host-keys-to-common deleted file mode 120000 index 0a1e17c7d..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/3.merge-host-keys-to-common +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/3.merge-host-keys-to-common \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/4.copy-host-keys-to-local-node b/clusters/vx/cfg/vxdb/config/ssh/4.copy-host-keys-to-local-node deleted file mode 120000 index 995bbba29..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/4.copy-host-keys-to-local-node +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/4.copy-host-keys-to-local-node \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/5.monitor-for-ssh_known_hosts-updates b/clusters/vx/cfg/vxdb/config/ssh/5.monitor-for-ssh_known_hosts-updates deleted file mode 120000 index 382199866..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/5.monitor-for-ssh_known_hosts-updates +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/5.monitor-for-ssh_known_hosts-updates \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/ssh/RPMS.Manifest deleted file mode 120000 index c5a49f626..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/RPMS.Manifest \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa b/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa deleted file mode 120000 index 44583743f..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/vagrant_rsa \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa.pub b/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa.pub deleted file mode 120000 index 95be9558d..000000000 --- a/clusters/vx/cfg/vxdb/config/ssh/vagrant_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/ssh/vagrant_rsa.pub \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/.RPMS.Manifest b/clusters/vx/cfg/vxdb/config/vboxadd/.RPMS.Manifest deleted file mode 100644 index 9e9f167e5..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/.RPMS.Manifest +++ /dev/null @@ -1,7 +0,0 @@ -bzip2 -dkms -gcc -kernel-devel -kernel-headers -make -perl diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/1.need-update-vbox-guest-additions b/clusters/vx/cfg/vxdb/config/vboxadd/1.need-update-vbox-guest-additions deleted file mode 120000 index c3a9b2693..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/1.need-update-vbox-guest-additions +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/vboxadd/1.need-update-vbox-guest-additions \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/2.install-vbox-prereq-rpms b/clusters/vx/cfg/vxdb/config/vboxadd/2.install-vbox-prereq-rpms deleted file mode 120000 index 58c517aa8..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/2.install-vbox-prereq-rpms +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/vboxadd/2.install-vbox-prereq-rpms \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/3.install-vbox-guest-additions b/clusters/vx/cfg/vxdb/config/vboxadd/3.install-vbox-guest-additions deleted file mode 120000 index e34f12c9e..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/3.install-vbox-guest-additions +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/vboxadd/3.install-vbox-guest-additions \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/4.vboxadd-systemctl-status b/clusters/vx/cfg/vxdb/config/vboxadd/4.vboxadd-systemctl-status deleted file mode 120000 index 10935204f..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/4.vboxadd-systemctl-status +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/vboxadd/4.vboxadd-systemctl-status \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/vboxadd/RPMS.Manifest b/clusters/vx/cfg/vxdb/config/vboxadd/RPMS.Manifest deleted file mode 120000 index 7537fb4ce..000000000 --- a/clusters/vx/cfg/vxdb/config/vboxadd/RPMS.Manifest +++ /dev/null @@ -1 +0,0 @@ -../../../provision/config/vboxadd/RPMS.Manifest \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/config/x-cleanup/1.stop-configuration-slurmdbd-service b/clusters/vx/cfg/vxdb/config/x-cleanup/1.stop-configuration-slurmdbd-service deleted file mode 100755 index 650cdf2b5..000000000 --- a/clusters/vx/cfg/vxdb/config/x-cleanup/1.stop-configuration-slurmdbd-service +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/config/slurm/3.reconfigure-munge-for-normal-operation - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -Rc ErrExit ${EX_SOFTWARE} "systemctl stop slurmdbd" - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/install/slurm/1.local-rpm-install b/clusters/vx/cfg/vxdb/install/slurm/1.local-rpm-install deleted file mode 120000 index bb2236071..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/1.local-rpm-install +++ /dev/null @@ -1 +0,0 @@ -/home/vagrant/common/provision/install/slurm/1.local-rpm-install \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/install/slurm/2.mk-slurm-dirs b/clusters/vx/cfg/vxdb/install/slurm/2.mk-slurm-dirs deleted file mode 100755 index 57ffc5273..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/2.mk-slurm-dirs +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/install/slurm/2.mk-slurm-dirs - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x SLURM_DIRS_FILE=(${PWD}/slurm.dirs) - -Rc ErrExit ${EX_OSFILE} "ln -s -f /home/vx/common/var/log/slurm /var/log/slurm" - -err=128 -slurm_dirs="" -if [ -f ${SLURM_DIRS_FILE} -a -s ${SLURM_DIRS_FILE} ] ; then - slurm_dirs=$(cat ${SLURM_DIRS_FILE}) -fi - -if [ -z "${slurm_dirs}" ] ; then - ErrExit ${err} "SLURM_DIRS_FILE: empty ${SLURM_DIRS_FILE}" -fi -(( err++ )) -for d in ${slurm_dirs} -do - Rc ErrExit ${err} "mkdir -p ${d}" - (( err++ )) -done - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/install/slurm/3.overlay-default-slurmdbd.service b/clusters/vx/cfg/vxdb/install/slurm/3.overlay-default-slurmdbd.service deleted file mode 100755 index 93ec34c81..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/3.overlay-default-slurmdbd.service +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vcdb/install/slurm/3.overlay-default-slurmdbd.service - -## @brief this drops a modified slurmdbd.service on top of the RPM-supplied slurmdbd.service file - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x USRLIBSYSTEMDSYSTEM=/usr/lib/systemd/system -declare -x SLURMDBD_SERVICE=${USRLIBSYSTEMDSYSTEM}/slurmdbd.service -Rc ErrExit 2 "cp ${ROOTFS}/${SLURMDBD_SERVICE} ${SLURMDBD_SERVICE}" - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/install/slurm/RPMS.Manifest b/clusters/vx/cfg/vxdb/install/slurm/RPMS.Manifest deleted file mode 100644 index 4958741fa..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/RPMS.Manifest +++ /dev/null @@ -1,2 +0,0 @@ -slurm -slurm-slurmdbd diff --git a/clusters/vx/cfg/vxdb/install/slurm/slurm.dirs b/clusters/vx/cfg/vxdb/install/slurm/slurm.dirs deleted file mode 100644 index c66eb79b1..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/slurm.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/home/vx/common/var/log/slurm -/var/run/slurm -/var/log/slurm diff --git a/clusters/vx/cfg/vxdb/install/slurm/version b/clusters/vx/cfg/vxdb/install/slurm/version deleted file mode 120000 index 4f97d71cf..000000000 --- a/clusters/vx/cfg/vxdb/install/slurm/version +++ /dev/null @@ -1 +0,0 @@ -../../../provision/install/slurm/version \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/requires/vcbuild/1.ping b/clusters/vx/cfg/vxdb/requires/vcbuild/1.ping deleted file mode 120000 index 875bca3ce..000000000 --- a/clusters/vx/cfg/vxdb/requires/vcbuild/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcbuild/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/requires/vcbuild/2.provisioned b/clusters/vx/cfg/vxdb/requires/vcbuild/2.provisioned deleted file mode 120000 index f9140cacc..000000000 --- a/clusters/vx/cfg/vxdb/requires/vcbuild/2.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcbuild/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/requires/vcbuild/ipaddr b/clusters/vx/cfg/vxdb/requires/vcbuild/ipaddr deleted file mode 120000 index b372064a0..000000000 --- a/clusters/vx/cfg/vxdb/requires/vcbuild/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcbuild/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/requires/vcdb/1.ping b/clusters/vx/cfg/vxdb/requires/vcdb/1.ping deleted file mode 120000 index 4b40dd598..000000000 --- a/clusters/vx/cfg/vxdb/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxdb/requires/vcdb/2.socket-MYSQL b/clusters/vx/cfg/vxdb/requires/vcdb/2.socket-MYSQL deleted file mode 100755 index 08a279369..000000000 --- a/clusters/vx/cfg/vxdb/requires/vcdb/2.socket-MYSQL +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vxsched/requires/vcdb/2.socket-SLURMDBD - -## @brief verifies connectivity to slurmdbd service port - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x IPADDR=$(cat ipaddr) -declare -x ETCSLURM=/etc/slurm - -declare -x SLURMDBDCONF=${ETCSLURM}/slurmdbd.conf -declare -x ETC_SERVICES=/etc/services -declare -x MYSQL_PORT=$(awk '/tcp.*# MySQL$/ {print $2}' ${ETC_SERVICES} | sed 's/\/tcp//') - -## @note warning because the recommended practice is a single slurmdbd for multicluster configurations -## @note this node exists to test alternate but less common scenarios -if [ ! -f "${SLURMDBDCONF}" ] ; then - Warn ${EX_SOFTWARE} " SLURMDBDCONF:${SLURMDBDCONF} does not exist" -fi - -Rc ErrExit 2 "[ -n \"${IPADDR}\" ] || false" -Rc ErrExit 3 "timeout ${TIMEOUT} ncat -4 -w1 -v -z ${IPADDR} ${MYSQL_PORT} >(tee -a "${OUT}") 2>&1 - -Rc ErrExit 2 "timeout ${TIMEOUT} sacctmgr show users >/dev/null" -Rc ErrExit 3 "timeout ${TIMEOUT} sacctmgr show qos >/dev/null" -Rc ErrExit 4 "timeout ${TIMEOUT} sacct -a --start=00:00:00 >/dev/null" - -trap '' 0 -exit ${EX_OK} diff --git a/clusters/vx/cfg/vxdb/verify/slurm/required.services b/clusters/vx/cfg/vxdb/verify/slurm/required.services deleted file mode 100644 index 4e92d3300..000000000 --- a/clusters/vx/cfg/vxdb/verify/slurm/required.services +++ /dev/null @@ -1,3 +0,0 @@ -munge -slurmdbd -another-bogus-service-to-force-verification diff --git a/clusters/vx/cfg/vxlogin/config/slurm/5.licenses b/clusters/vx/cfg/vxlogin/config/slurm/5.licenses index 5b1ac13cf..ea3be6d11 100755 --- a/clusters/vx/cfg/vxlogin/config/slurm/5.licenses +++ b/clusters/vx/cfg/vxlogin/config/slurm/5.licenses @@ -62,7 +62,7 @@ do clause=" type=license cluster=${cluster} " suffix=" count=${count} " if [ -n "${existing_licenses}" ] ; then - if [[ "${existing_licenses}" != *"${lic}"*"${cluster}" ]] ; then + if [[ "${existing_licenses}" = ${lic}*${cluster} ]] ; then action="update" clause=" cluster=${cluster} set " suffix="" @@ -83,10 +83,11 @@ do attr_val=$(cat ${d}/${attr_name}) fi if [[ "${existing}" == *"${lic_name}"* ]] ; then - existing_val=$(sacctmgr show resource withcluster where cluster=${cluster} name=${lic_name} -n | awk '{print $5}') + existing_val=$(sacctmgr show resource withcluster where cluster=${cluster} name=${lic_name} -n | awk '{print $7}') if [ "${existing_val}" = "${attr_val}" ] ; then if [ "${attr_val}" -ne 0 ] ; then Verbose "license=${lic_name}, cluster=${cluster}, existing_val:${existing_val} = attr_val:${attr_val}, skipped" + continue fi fi diff --git a/clusters/vx/cfg/vxlogin/config/slurm/ipaddr-slurmdbd.%VCDB% b/clusters/vx/cfg/vxlogin/config/slurm/ipaddr-slurmdbd.%VCDB% index 86f476c8e..30545bb95 100644 --- a/clusters/vx/cfg/vxlogin/config/slurm/ipaddr-slurmdbd.%VCDB% +++ b/clusters/vx/cfg/vxlogin/config/slurm/ipaddr-slurmdbd.%VCDB% @@ -1 +1 @@ -%VCDB% +192.168.56.1 diff --git a/clusters/vx/cfg/vxlogin/requires/vcdb/1.ping b/clusters/vx/cfg/vxlogin/requires/vcdb/1.ping deleted file mode 120000 index d4984f900..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vcdb/2.socket-SLURMDBD b/clusters/vx/cfg/vxlogin/requires/vcdb/2.socket-SLURMDBD deleted file mode 120000 index d781988ed..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vcdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vcdb/3.provisioned b/clusters/vx/cfg/vxlogin/requires/vcdb/3.provisioned deleted file mode 120000 index e1f9cd582..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vcdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vcdb/ipaddr b/clusters/vx/cfg/vxlogin/requires/vcdb/ipaddr deleted file mode 120000 index 0fe7d80f4..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vcdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vxdb/1.ping b/clusters/vx/cfg/vxlogin/requires/vxdb/1.ping deleted file mode 120000 index f44be12eb..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vxdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vxdb/2.socket-SLURMDBD b/clusters/vx/cfg/vxlogin/requires/vxdb/2.socket-SLURMDBD deleted file mode 120000 index cf9bd4b02..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vxdb/2.socket-SLURMDBD +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/2.socket-SLURMDBD \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vxdb/3.provisioned b/clusters/vx/cfg/vxlogin/requires/vxdb/3.provisioned deleted file mode 120000 index bc345e805..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vxdb/3.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/requires/vxdb/ipaddr b/clusters/vx/cfg/vxlogin/requires/vxdb/ipaddr deleted file mode 120000 index 53db67b2d..000000000 --- a/clusters/vx/cfg/vxlogin/requires/vxdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vxlogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vxlogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm index 43871efcc..25aebca89 100644 Binary files a/clusters/vx/cfg/vxlogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vxlogin/rpm/early/munge-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vxlogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vxlogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm index 44f419150..dbd4f989e 100644 Binary files a/clusters/vx/cfg/vxlogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vxlogin/rpm/early/munge-devel-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vxlogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm b/clusters/vx/cfg/vxlogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm index a8e9bd341..a47c20a6f 100644 Binary files a/clusters/vx/cfg/vxlogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm and b/clusters/vx/cfg/vxlogin/rpm/early/munge-libs-0.5.11-3.el7.x86_64.rpm differ diff --git a/clusters/vx/cfg/vxlogin/verify/slurm/9b.multicluster-test-cmds b/clusters/vx/cfg/vxlogin/verify/slurm/9b.multicluster-test-cmds index 75a8b711d..f8d8e4b22 100755 --- a/clusters/vx/cfg/vxlogin/verify/slurm/9b.multicluster-test-cmds +++ b/clusters/vx/cfg/vxlogin/verify/slurm/9b.multicluster-test-cmds @@ -41,10 +41,25 @@ do clusters=$(echo $(sacctmgr show user ${_u} withass format=cluster -n | sort | uniq)) done +set -xv +export TIMEOUT=3 +_T="timeout ${TIMEOUT} " + for _c in ${clusters} do - Rc ErrExit ${EX_SOFTWARE} "squeue -M ${_c} -h" - Rc ErrExit ${EX_SOFTWARE} "sacct -M ${_c} -a" + # dbd commands + for _C in "sacct -a" "sacct -M ${_c} -a" + do + #echo "$_C" + Rc ErrExit ${EX_SOFTWARE} "${_T} ${_C}" + done + # ctld commands + for _C in "sdiag" "sdiag -M ${_c}" "squeue -h" "squeue -M ${_c} -h" + do + #echo "$_C" + #Rc ErrExit ${EX_SOFTWARE} "${_T} ${_C}" + ${_T} ${_C} + done done trap '' 0 diff --git a/clusters/vx/cfg/vxsched/config/munge/5.verify-db b/clusters/vx/cfg/vxsched/config/munge/5.verify-db index e2dbe4562..8f7ee135a 100755 --- a/clusters/vx/cfg/vxsched/config/munge/5.verify-db +++ b/clusters/vx/cfg/vxsched/config/munge/5.verify-db @@ -25,65 +25,68 @@ SetFlags >/dev/null 2>&1 declare -x ETCSLURM=/etc/slurm declare -x SLURMCONF=${ETCSLURM}/slurm.conf declare -x SLURMDBDCONF=${ETCSLURM}/slurmdbd.conf -declare -x VX_COMMON_ROOT=/home/vx/common/root -declare -x MYSQL_PW_F=${VX_COMMON_ROOT}/mysql_pw -declare -x MYSQL_PW + +if [ ! -f ${SLURMCONF} ] ; then + ErrExit ${EX_SOFTWARE} "SLURMCONF:${SLURMCONF} file not found" +fi CLUSTERNAME=$(grep ClusterName ${SLURMCONF} | sed 's/ClusterName=//') rc=$? - +echo "slurm.conf: ClusterName=\"${CLUSTERNAME}\"" if [ ${rc} -ne ${GREP_FOUND} ] ; then - ErrExit ${EX_SOFTWARE} "ClusterName not found in ${SLURMCONF}" + ErrExit ${EX_SOFTWARE} "SLURMCONF:${SLURMCONF} ClusterName not found" fi -if [ ! -d "${VX_COMMON_ROOT}" ] ; then - ErrExit ${EX_SOFTWARE} "VX_COMMON_ROOT: not a directory (or not mounted)" +if [ ! -f ${SLURMDBDCONF} ] ; then + ErrExit ${EX_SOFTWARE} "SLURMDBDCONF:${SLURMDBDCONF} file not found" fi -if [ ! -f "${MYSQL_PW_F}" ] ; then - ErrExit ${EX_SOFTWARE} "MYSQL_PW_F:${MYSQL_PW_F} does not exist?" -fi - -MYSQL_PW=$(cat ${MYSQL_PW_F}) -if [ -z "${MYSQL_PW}" ] ; then - Warn ${EX_SOFTWARE} "vc cluster mysql password is empty, proceeding" +STORAGEUSER=$(grep StorageUser ${SLURMDBDCONF} | sed 's/StorageUser=//') +MYSQL_AUTH="" +if [ -n "${STORAGEUSER}" ] ; then + MYSQL_AUTH="--user=${STORAGEUSER} " fi - -MYSQL_U=$(id -n -u) - -if [ -z "${MYSQL_U}" ] ; then - ErrExit ${EX_SOFTWARE} "MYSQL_U:${MYSQL_U} is empty: $(id -n -u)" +STORAGEPASS=$(grep StoragePass ${SLURMDBDCONF} | sed 's/StoragePass=//') +if [ -n "${STORAGEPASS}" ] ; then + MYSQL_AUTH="${MYSQL_AUTH} --password=${STORAGEPASS}" fi -mysql_auth="--user=${MYSQL_U} --password=${MYSQL_PW}" - +export dbdhost=$(grep -i dbdhost ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdhost=//') export dbdaddr=$(grep -i dbdaddr ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdaddr=//') -STORAGEHOST=$(awk '/^StorageHost=/ {print $NF}' ${SLURMDBDCONF} | sed 's/StorageHost=//') - +if [ -z "${dbdhost}" ] ; then + ErrExit ${EX_SOFTWARE} "empty dbdhost" +fi if [ -z "${dbdaddr}" ] ; then ErrExit ${EX_SOFTWARE} "empty dbdaddr" fi -TIMEOUT=10 -# -w (deadline), -W (timeout) -Rc ErrExit ${EX_SOFTWARE} "ping -c 1 -i 0.1 -n -w ${TIMEOUT} ${STORAGEHOST} && ping -c 1 -i 0.1 -n -W ${TIMEOUT} ${dbdaddr}" +DBDHost=$(grep AccountingStorageHost= ${SLURMCONF} | sed 's/AccountingStorageHost=//') -Rc Warn ${EX_SOFTWARE} "timeout ${TIMEOUT} mysql --host=${STORAGEHOST} ${mysql_auth} --batch --execute 'show databases;'" +MYSQL_CMD="mysql ${MYSQL_AUTH} --batch" +if [ "${DBDHost}" = $(hostname -s) ] ; then + MYSQL_CMD="${MYSQL_CMD} --host=${dbdhost}" + grep StorageUser ${SLURMDBDCONF} +else + MYSQL_CMD="${MYSQL_CMD} --host=${DBDHost}" + dbdhost=${DBDHost} + dbdaddr=$(host ${DBDHost} | awk '{print $4}') +fi +Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ping -c 1 -i 1 -n ${dbdhost}" -clustername=$(timeout ${TIMEOUT} mysql --database=slurm_acct_db --host=${STORAGEHOST} ${mysql_auth} --batch --skip-column-names --execute 'select name from cluster_table;' ) +#XXX Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;'" -if [[ ${clustername} = *" ${CLUSTERNAME} "* ]] ; then - ErrExit ${EX_SOFTWARE} "select name from cluster_table => ${clustername} != ${CLUSTERNAME}" -fi +timeout ${TIMEOUT} ${MYSQL_CMD} --execute 'show databases;' -Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} mysql --database=slurm_acct_db --host=${STORAGEHOST} ${mysql_auth} --batch --execute 'show tables;' --skip-column-names | grep ${CLUSTERNAME}_last_ran" -rc=$? -if [ "${rc}" -ne ${GREP_FOUND} ] ; then - ErrExit ${EX_SOFTWARE} "did not find ${CLUSTERNAME}_last_ran_table in 'show tables;'" -fi +clustername=$(timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'select name from cluster_table;' ) + +#XXX if [[ ${clustername} != ${CLUSTERNAME} ]] ; then +#XXX ErrExit ${EX_SOFTWARE} "select name from cluster_table => ${clustername} != ${CLUSTERNAME}" +#XXX fi + +#XXX Rc ErrExit ${EX_SOFTWARE} "timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran" + +timeout ${TIMEOUT} ${MYSQL_CMD} --database=slurm_acct_db --skip-column-names --execute 'show tables;' | grep ${CLUSTERNAME}_last_ran trap '' 0 exit ${EX_OK} - -# vi: background=dark diff --git a/clusters/vx/cfg/vxsched/requires/vcdb/1.ping b/clusters/vx/cfg/vxsched/requires/vcdb/1.ping deleted file mode 120000 index d4984f900..000000000 --- a/clusters/vx/cfg/vxsched/requires/vcdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxsched/requires/vcdb/2.provisioned b/clusters/vx/cfg/vxsched/requires/vcdb/2.provisioned deleted file mode 120000 index e1f9cd582..000000000 --- a/clusters/vx/cfg/vxsched/requires/vcdb/2.provisioned +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/3.provisioned \ No newline at end of file diff --git a/clusters/vx/cfg/vxsched/requires/vcdb/ipaddr b/clusters/vx/cfg/vxsched/requires/vcdb/ipaddr deleted file mode 120000 index 0fe7d80f4..000000000 --- a/clusters/vx/cfg/vxsched/requires/vcdb/ipaddr +++ /dev/null @@ -1 +0,0 @@ -../../../../common/provision/requires/vcdb/ipaddr \ No newline at end of file diff --git a/clusters/vx/cfg/vxsched/requires/vxdb/1.ping b/clusters/vx/cfg/vxsched/requires/vxdb/1.ping deleted file mode 120000 index f44be12eb..000000000 --- a/clusters/vx/cfg/vxsched/requires/vxdb/1.ping +++ /dev/null @@ -1 +0,0 @@ -../../../provision/requires/vxdb/1.ping \ No newline at end of file diff --git a/clusters/vx/cfg/vxsched/requires/vxdb/2.socket-SLURMDBD b/clusters/vx/cfg/vxsched/requires/vxdb/2.socket-SLURMDBD deleted file mode 100755 index 7cfeadb05..000000000 --- a/clusters/vx/cfg/vxsched/requires/vxdb/2.socket-SLURMDBD +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -## $Header: $ -## Source: -## @file vxsched/requires/vxdb/2.socket-SLURMDBD - -## @brief verifies connectivity to slurmdbd service port - -VCLOAD=../../../provision/loader/shload.sh - -if [ ! -f "${VCLOAD}" ] ; then - echo "${0}: missing: ${VCLOAD}" - exit 99 -fi -source ${VCLOAD} - -# if we're given an argument, append test output to it -declare -x OUT=${1:-""} - -if [ -n "${OUT}" ] ; then - touch ${OUT} || exit 1 - exec > >(tee -a "${OUT}") 2>&1 -fi - -declare -x IPADDR=$(cat ipaddr) -declare -x ETCSLURM=/etc/slurm -declare -x COMMON_ETCSLURM=${COMMON}${ETCSLURM} -declare -x SLURMCONF=${COMMON_ETCSLURM}/slurm.conf -declare -x SLURMDBDCONF=${COMMON_ETCSLURM}/slurmdbd.conf - -## @note these are warnings because this prerequisite test is done as part of node validation, -## @note which may not be complete yet for this host -for _c in SLURMDBDCONF SLURMCONF -do - if [ ! -f "${!_c}" ] ; then - Rc Warn ${EX_OSFILE} "test -f ${!_c}" - fi -done - -if [ -f ${SLURMDBDCONF} ] ; then - dbdport=$(grep -i dbdport ${SLURMDBDCONF} | tr '[:upper:]' '[:lower:]' | sed 's/dbdport=//') - if [ -z "${dbdport}" ] ; then - if [[ ${_dbdport} != "#" ]] ; then - dbdport=${_dbdport} - fi - fi -fi - -if [ -z "${dbdport}" ] ; then - dbdport=${DEFAULT_DBDPORT} -fi -numeric='^[0-9]+$' -if ! [[ ${dbdport} =~ $numeric ]] ; then - Warn EX_OK " Warning: dbdport (\"${dbdport}\") is not numeric, using DEFAULT_DBDPORT:${DEFAULT_DBDPORT}" - dbdport=${DEFAULT_DBDPORT} -fi -if [ -z "${dbdport}" -o '#' = "${dbdport}" ] ; then - echo " Warning: dbdport may be incorrectly defined in slurmdbd.conf and/or slurm.conf. dbdport:${dbdport}, using DEFAULT_DBDPORT:${DEFAULT_DBDPORT}" - dbdport=${DEFAULT_DBDPORT} -fi - -Rc ErrExit 2 "[ -n \"${IPADDR}\" ] || false" -Rc ErrExit 3 "timeout ${TIMEOUT} ncat -4 -w1 -v -z ${IPADDR} ${dbdport} /dev/null 2>&1 ; \ + rc=$$? ; \ + if [ "$${rc}" -ne 0 ] ; then \ + echo Warning: cannot ping repository $${REPO_HOST} ; \ + fi ; \ + rm -f $(TARBALL_D)/REPO_URL ; \ + declare -x BEHIND_PROXY ; \ + BEHIND_PROXY=$$(env | grep proxy) ; \ + declare -x RSYNC_PROXY ; \ + RSYNC_PROXY=$$(echo $$http_proxy | sed 's/http:\/\///') ; \ + declare -x DOWNLOAD_URL=$(REPO_URL)$(subst $(REPO_WORKSPACE_D),,$(@D))/ ; \ + if [[ "$(REPO_URL)" = *"rsync:"* ]] ; then \ + rsync --dry-run -4 -avz --delete --exclude=\*i686\.rpm $${DOWNLOAD_URL} $(@D) ; \ + rc=$$? ; \ + elif [[ "$(REPO_URL)" = *"http:"* ]] ; then \ + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --spider --timeout=5 --tries=2 -e robots=off --inet4-only $(REPO_URL)/index.html ; \ + rc=$$? ; \ + else \ + echo " Which handler for url? $${DOWNLOAD_URL}" ; \ + rc=1 ; \ + fi ; \ + if [ "$${rc}" -ne 0 ] ; then \ + echo "Try: " ; \ + echo " export RSYNC_PROXY=$${RSYNC_PROXY}" ; \ + echo " export http_proxy=$${http_proxy}" ; \ + echo " export proxy=$${proxy}" ; \ + echo " rsync -4 -avz --delete --exclude=\*i686\.rpm $${DOWNLOAD_URL} $(@D)" ; \ + echo " or:" ; \ + echo " wget --timestamping --timeout=30 --no-parent --mirror --reject "*i686.rpm,*.torrent,index.html*" -e robots=off --random-wait --inet4-only --recursive --directory-prefix=$(TARBALL_D) $${DOWNLOAD_URL}" ; \ + echo " " ; \ + echo Cannot ingest: $${DOWNLOAD_URL} to $(@D) ; \ + echo Please download repository copy from, for example, ; \ + echo " $(REPO_HTTP_URL)" ; \ + echo " to $(@D) $(realpath $(@D))" ; \ + exit 99 ; \ + fi ; \ + if [[ "$(REPO_URL)" = "rsync:"* ]] ; then \ + mkdir -p $(@D) ; \ + rsync -4 -avz --delete --exclude=*i686.rpm $${DOWNLOAD_URL} $(@D) ; \ + rc=$$? ; \ + elif [[ "$(REPO_URL)" = "http:"* ]] ; then \ + wget --timestamping --timeout=30 --no-parent --mirror --reject "*i686.rpm,*.torrent,index.html*" -e robots=off --random-wait --inet4-only --recursive --directory-prefix=$(TARBALL_D) $${DOWNLOAD_URL} ; \ + rc=$$? ; \ + rm -f $(REPO_WORKSPACE_D) ; \ + ln -s $${REPO_HOST} $(REPO_WORKSPACE_D) ; \ + fi ; \ + if [ "$${rc}" -ne 0 ] ; then \ + echo "Remote repository: $(REPO_URL) inaccessible? " ; \ + echo "Try setting a different repository (the final line) in $(CURDIR)/repos" ; \ + exit 99 ; \ fi - rsync -4 -avz --delete --exclude=*i686.rpm $(REPO_URL)$(subst $(REPO_WORKSPACE_D),,$(@D))/ $(@D) + # Record which one we actually used echo $(REPO_URL) > $(TARBALL_D)/REPO_URL touch $@ # use this to pull a repo and roll a tarball $(TARBALL_D)/$(repo_tgz): $(REPO_WORKSPACE_D) $(REPO_OS) $(REPO_UPDATES) - tar --exclude=.target -czvf $(TARBALL_D)/repos.tgz -C $(TARBALL_D) repos + tar --exclude=.target -chzvf $(TMP_REPO_TGZ) -C $(TARBALL_D) `readlink repos` . + mv $(TMP_REPO_TGZ) $(TARBALL_D)/$(repo_tgz) $(TARBALL_D)/$(repo_cksum): $(TARBALL_D)/$(repo_tgz) cksum $^ > $@ $(TARBALL_D)/$(SLURM_TARBALL): - wget -4 -P $(@D) $(SCHEDMD_SLURM_URL)/$(SLURM_TARBALL) + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=60 -4 -P $(@D) $(SCHEDMD_SLURM_URL)/$(SLURM_TARBALL) + +$(TARBALL_VAGRANT_INSTALLED_FLAG): $(TARBALL_D)/$(VAGRANT_WHICH_RPM) + sudo yum -y localinstall $< + echo $(VAGRANT_WHICH_RPM) > $@ + +$(TARBALL_D)/$(VAGRANT_WHICH_RPM): + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=60 -4 -P $(@D) $(VAGRANT_URL) || rm -f $@ # set http_proxy or https_proxy if need be $(TARBALL_D)/$(VBOX_ISO): - wget -4 -P $(@D) $(VBOX_ISO_URL)/$(VBOX_ISO) - + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=60 -4 -P $(@D) $(VBOX_ISO_URL)/$(VBOX_ISO) + +$(VBOX_INGEST_GPGKEY): + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=15 -4 -O$@ $(VBOX_GPGKEY_URL) + +$(VBOX_YUM_REPO_F): $(VBOX_INGEST_GPGKEY) $(VBOX_INGEST_REPO_F) + sudo rpm --import - < $< + sudo cp $(VBOX_INGEST_REPO_F) $@ + +$(TARBALL_VBOX_INSTALLED_FLAG): $(VBOX_YUM_REPO_F) + sudo yum -y install $(VBOX_RPM_PREREQ) + sudo yum -y install $(VBOX_RPM) + echo $(VBOX_RPM) > $@ # DB selection & ingestion # community mysql doesn't use a repo_setup script; it has a primer RPM $(TARBALL_D)/community-mysql/RPMS/$(COMMUNITY_MYSQL_PRIMER_RPM): $(TARBALL_D)/community-mysql $(TARBALL_D)/community-mysql/RPMS if [ ! -f $@ ] ; then \ - wget -4 -P $(@D) $(URL)/$(@F) ; \ + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=1800 -4 -P $(@D) $(URL)/$(@F) ; \ fi $(foreach f,$(COMMUNITY_MYSQL_RPMS),$(TARBALL_D)/community-mysql/RPMS/$(f)): $(TARBALL_D)/community-mysql/RPMS/$(COMMUNITY_MYSQL_PRIMER_RPM) if [ ! -f $@ ] ; then \ - wget -4 -P $(@D) $(URL)/$(@F) ; \ + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=300 -4 -P $(@D) $(URL)/$(@F) ; \ fi # some db require a download token $(DOWNLOAD_SETUP): $(DOWNLOAD_TOKEN) if [ ! -f $@ ] ; then \ - wget -4 -P $(@D) $(URL)$(@F) ; \ + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=10 --tries=2 -4 -P $(@D) $(URL)$(@F) ; \ + rc=$$? ; \ + fi ; \ + if [ "$${rc}" -ne 0 ] ; then \ + echo "Couldn't retrieve $(URL)$(@F)" ; \ + echo " http_proxy: $${http_proxy}" ; \ + echo " https_proxy: $${https_proxy}" ; \ + exit 1 ; \ fi $(DOWNLOAD_GPGKEY): $(DOWNLOAD_TOKEN) if [ ! -f $@ ] ; then \ - wget -4 -P $(@D) $(GPGKEY_URL)$(@F) ; \ + declare -x http_proxy=http://proxyout.lanl.gov:8080 ; \ + declare -x https_proxy=$${http_proxy} ; \ + declare -x proxy=$${http_proxy} ; \ + wget --timeout=10 --tries=2 -4 -P $(@D) $(GPGKEY_URL)$(@F) ; \ fi $(DOWNLOAD_TOKEN): diff --git a/requires/ingest/repos b/requires/ingest/repos index dddd6a9c2..9a21256c8 100644 --- a/requires/ingest/repos +++ b/requires/ingest/repos @@ -8,3 +8,4 @@ rsync://mirrors.kernel.org rsync://mirrors.ocf.berkeley.edu rsync://mirrors.rit.edu rsync://rsync.gtlib.gatech.edu +http://linux.mirrors.es.net diff --git a/requires/ingest/vbox/longname b/requires/ingest/vbox/longname new file mode 100644 index 000000000..f9b6c8268 --- /dev/null +++ b/requires/ingest/vbox/longname @@ -0,0 +1 @@ +VirtualBox diff --git a/requires/ingest/vbox/oracle_vbox.asc b/requires/ingest/vbox/oracle_vbox.asc new file mode 100644 index 000000000..44dbdbed1 --- /dev/null +++ b/requires/ingest/vbox/oracle_vbox.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBEvy0LARBACPBH1AUv6krDseyvbL63CWS9fw43iReZ+NmgmDp4/sPsYHLduQ +rxKSqiK7fgFFE+fas/7DCaZXIQW6hnqeD3CgnX0w1+gYiyqEuPY1LQH9okBR5o92 +/s2FLm7oUN4RNGv6vWoNSH1ZiRHknL5D0pKSGTKU+pG6cBYWJytAuJZHfwCguS55 +aPZuXfhjaWsXG8TF6GH0K8ED/RY3KbirJ7rueK/7KL7ziwqn4CdhQSLOhbZ/R2E0 +bknJQDo+vWJciRRRpTe+AG59ctgDF7lEXpjvCms0atyKtE8hObNaMJ5p48l/sgFL +LEujqiq4tByAn2hDOf0s7YrfruIY+HHkBSI9XbwH9nPlsQq8WNsTWTzPrw+ZlQ7v +AEuuA/9cJ/4qYUOq1pg3i/GqH+2dbRHOFH6idXr5YrdB3cYW8jORagOcwdQHeV/0 +CaTZVMyMhTVjtIiUt+UR/96CHKxedg0giHwD61GidpUVBUYSaDhjOKE3jwf6/jo5 +714e4+ZfL3y1Q2N4HzfK/gEkvPZby/o8WX2N7vUcxfztQ8yq6bRJT3JhY2xlIENv +cnBvcmF0aW9uIChWaXJ0dWFsQm94IGFyY2hpdmUgc2lnbmluZyBrZXkpIDxpbmZv +QHZpcnR1YWxib3gub3JnPohgBBMRAgAgBQJL8tCwAhsDBgsJCAcDAgQVAggDBBYC +AwECHgECF4AACgkQVEIqS5irUTmlvwCeIjsPZ0I9HhLmlS9dLjk397Y5rncAn3kB +XUPRIWb83FMxRwqS85rTCZyouQINBEvy0LAQCAC/pkqDW6H99qQdyW8zvQL5xj6C +UcvlTpL5VkaIRDVwRNbiFoWsVMv2jdhmlJEoh5N+aXYcAzLv0HaiZBSDmTO6fqMM +uPRHyIioQQUFNW4hRI7sdMkYvd2oZcxnzRCLdzG+s42EmzxE4F29eT/FA7o/QBj2 +nDbomVqM9jCXKB5/jSJ0W3Uf7I8b7go0AawJT9vVARRMFjz4A7h6QfjeSO9sPHSC +1Dx5Fmd3u4y08W+o6w2kxXRYT9wfMFuGl4MWVJ+f6KPyRhqRCEaa/mz7lXhQdfeG +qW8psDHKmoNnpPEq5Rl4aDIJOppwYJhnDELv+k8JJ6R1JM9hJUWTG8zv9sLzAAMF +CAC6pagGYEK8Dh+3SV6dXjBLNghmj5qnx6GoCXwCDTEFXeWUnszZrqM7PTKLyrfK +ZjOhluydpQSGY7TqDBJJ6emLyNNJV92IQ21eN/h9i0wB97pu8jwvi7RjD0vSkDHh +OpSr9vJm9EeESU1Z+mEKOjz2AONjRLplbBNt9kbXmSWpIP8XMFkU+1KTuNbfi+h4 +muOJWKkAGcT7bMUlqbZQjZ2O0RtwDjThxHvw8NhRkxPDYHVxE4uRRobhPquq4NsC +QkMc7LlRilXZCS5mrabHw5+edullNWaQtGuKGlQXGfM4kEhGt7b/XIiyhI5bsh60 +o8Mz0KuFpClp9B7c78+QBzTbiEkEGBECAAkFAkvy0LACGwwACgkQVEIqS5irUTnq +qACgtXuTbe2b72sgKdc6gGRKPhLDoEMAmgLwGVN3a4CqewQL+03bqfcKczNH +=19g1 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/clusters/vc/cfg/vcfs/attributes/adddiskpath/size/20 b/requires/ingest/vbox/prereq/binutils similarity index 100% rename from clusters/vc/cfg/vcfs/attributes/adddiskpath/size/20 rename to requires/ingest/vbox/prereq/binutils diff --git a/clusters/vx/cfg/vxdb/rpm/install/gcc b/requires/ingest/vbox/prereq/gcc similarity index 100% rename from clusters/vx/cfg/vxdb/rpm/install/gcc rename to requires/ingest/vbox/prereq/gcc diff --git a/clusters/vx/cfg/vxdb/attributes/bootorder/5 b/requires/ingest/vbox/prereq/glibc-devel similarity index 100% rename from clusters/vx/cfg/vxdb/attributes/bootorder/5 rename to requires/ingest/vbox/prereq/glibc-devel diff --git a/clusters/vx/cfg/vxdb/attributes/memory/2304 b/requires/ingest/vbox/prereq/glibc-headers similarity index 100% rename from clusters/vx/cfg/vxdb/attributes/memory/2304 rename to requires/ingest/vbox/prereq/glibc-headers diff --git a/clusters/vx/cfg/vxdb/attributes/procs/1 b/requires/ingest/vbox/prereq/kernel-devel similarity index 100% rename from clusters/vx/cfg/vxdb/attributes/procs/1 rename to requires/ingest/vbox/prereq/kernel-devel diff --git a/clusters/vx/cfg/vxdb/attributes/timeout/1200 b/requires/ingest/vbox/prereq/kernel-devel-$(uname -r) similarity index 100% rename from clusters/vx/cfg/vxdb/attributes/timeout/1200 rename to requires/ingest/vbox/prereq/kernel-devel-$(uname -r) diff --git a/clusters/vx/cfg/vxdb/config/firewall/zones/public/interfaces/eth0 b/requires/ingest/vbox/prereq/libgomp similarity index 100% rename from clusters/vx/cfg/vxdb/config/firewall/zones/public/interfaces/eth0 rename to requires/ingest/vbox/prereq/libgomp diff --git a/clusters/vx/cfg/vxdb/config/firewall/zones/trusted/add-port/6819 b/requires/ingest/vbox/prereq/libxkbcommon similarity index 100% rename from clusters/vx/cfg/vxdb/config/firewall/zones/trusted/add-port/6819 rename to requires/ingest/vbox/prereq/libxkbcommon diff --git a/clusters/vx/cfg/vxdb/config/firewall/zones/trusted/interfaces/eth1 b/requires/ingest/vbox/prereq/make similarity index 100% rename from clusters/vx/cfg/vxdb/config/firewall/zones/trusted/interfaces/eth1 rename to requires/ingest/vbox/prereq/make diff --git a/clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-client b/requires/ingest/vbox/prereq/patch similarity index 100% rename from clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-client rename to requires/ingest/vbox/prereq/patch diff --git a/clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-client-plugins b/requires/ingest/vbox/prereq/python2.7 similarity index 100% rename from clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-client-plugins rename to requires/ingest/vbox/prereq/python2.7 diff --git a/clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-common b/requires/ingest/vbox/prereq/qt5-qtx11extras similarity index 100% rename from clusters/vx/cfg/vxdb/rpm/flagged/WHICH_DB/community-mysql/add/mysql-community-common rename to requires/ingest/vbox/prereq/qt5-qtx11extras diff --git a/requires/ingest/vbox/vbox.proxy.repo b/requires/ingest/vbox/vbox.proxy.repo new file mode 100644 index 000000000..871165d29 --- /dev/null +++ b/requires/ingest/vbox/vbox.proxy.repo @@ -0,0 +1,8 @@ +[oracle-virtualbox] +name=Oracle Linux / RHEL / CentOS-$releasever / $basearch - VirtualBox +baseurl=http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch +enabled=1 +gpgcheck=1 +repo_gpgcheck=1 +gpgkey=https://www.virtualbox.org/download/oracle_vbox.asc +proxy=http://proxyout.lanl.gov:8080/ diff --git a/requires/ingest/vbox/vbox.repo b/requires/ingest/vbox/vbox.repo new file mode 100644 index 000000000..59ad2373e --- /dev/null +++ b/requires/ingest/vbox/vbox.repo @@ -0,0 +1,7 @@ +[oracle-virtualbox] +name=Oracle Linux / RHEL / CentOS-$releasever / $basearch - VirtualBox +baseurl=http://download.virtualbox.org/virtualbox/rpm/el/$releasever/$basearch +enabled=1 +gpgcheck=1 +repo_gpgcheck=1 +gpgkey=https://www.virtualbox.org/download/oracle_vbox.asc diff --git a/requires/sw/libvirtd/cmd b/requires/sw/libvirtd/cmd deleted file mode 100755 index 578a29a5d..000000000 --- a/requires/sw/libvirtd/cmd +++ /dev/null @@ -1 +0,0 @@ -libvirtd --version | awk '{print $NF}' diff --git a/requires/sw/libvirtd/version b/requires/sw/libvirtd/version deleted file mode 100644 index dfda3e0b4..000000000 --- a/requires/sw/libvirtd/version +++ /dev/null @@ -1 +0,0 @@ -6.1.0 diff --git a/requires/sw/qemu-kvm/cmd b/requires/sw/qemu-kvm/cmd index 7fd953105..2aa0a3263 100755 --- a/requires/sw/qemu-kvm/cmd +++ b/requires/sw/qemu-kvm/cmd @@ -1 +1 @@ -qemu-kvm --version | grep version | awk '{print $4}' +/usr/libexec/qemu-kvm --version | grep version | awk '{print $4}' diff --git a/requires/sw/qemu-kvm/version b/requires/sw/qemu-kvm/version index fae6e3d04..8af85beb5 100644 --- a/requires/sw/qemu-kvm/version +++ b/requires/sw/qemu-kvm/version @@ -1 +1 @@ -4.2.1 +1.5.3 diff --git a/requires/sw/qemu/version b/requires/sw/qemu/version index fae6e3d04..227cea215 100644 --- a/requires/sw/qemu/version +++ b/requires/sw/qemu/version @@ -1 +1 @@ -4.2.1 +2.0.0 diff --git a/requires/sw/vagrant-plugin-libvirt/cmd b/requires/sw/vagrant-plugin-libvirt/cmd deleted file mode 100755 index 87d971991..000000000 --- a/requires/sw/vagrant-plugin-libvirt/cmd +++ /dev/null @@ -1 +0,0 @@ -vagrant plugin list | grep vagrant-libvirt | awk '{print $2}' | sed 's/(//' | sed 's/,$//' diff --git a/requires/sw/vagrant-plugin-libvirt/version b/requires/sw/vagrant-plugin-libvirt/version deleted file mode 100644 index 31c01c92c..000000000 --- a/requires/sw/vagrant-plugin-libvirt/version +++ /dev/null @@ -1 +0,0 @@ -0.0.45