From 56803ce9e645d8aa81137e943727b4e8e369e8e3 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 28 Apr 2023 16:00:23 +0300 Subject: [PATCH] Update the c_bmc IPs Do not use IPMI_PASSWORD, i.e. remove -E Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/recipe.yml | 2 +- docs/recipes/install/openeuler22.03/input.local.tests | 2 +- oe-22.03-recipe.sh | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/recipe.yml b/.github/workflows/recipe.yml index cea2dee95b..3509db706f 100644 --- a/.github/workflows/recipe.yml +++ b/.github/workflows/recipe.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - name: Run recipe run: | - set -xe + set -x . /etc/profile.d/lmod.sh #sudo tests/ci/run_build.py ohpc components/admin/docs/SPECS/docs.spec #sudo dnf -y install $(find /home/ohpc/rpmbuild/RPMS/ -name "*rpm") || true diff --git a/docs/recipes/install/openeuler22.03/input.local.tests b/docs/recipes/install/openeuler22.03/input.local.tests index 973dd07c01..18d2b157f8 100644 --- a/docs/recipes/install/openeuler22.03/input.local.tests +++ b/docs/recipes/install/openeuler22.03/input.local.tests @@ -6,7 +6,7 @@ internal_netmask=255.255.252.0 ntp_server=192.168.1.220 c_ip=(192.168.1.221 192.168.1.222 192.168.1.223) c_name=(c1 c2 c3) -c_bmc=(192.168.2.211 192.168.2.212 192.168.2.213) +c_bmc=(192.168.2.221 192.168.2.222 192.168.2.223) c_mac=(f4:de:af:6c:e2:87 f4:de:af:6c:e2:95 f4:de:af:6c:e2:6b) compute_regex=c[1-3] compute_prefix=c diff --git a/oe-22.03-recipe.sh b/oe-22.03-recipe.sh index 47f6c81d23..fb92f663dd 100755 --- a/oe-22.03-recipe.sh +++ b/oe-22.03-recipe.sh @@ -149,6 +149,7 @@ cp -p /etc/resolv.conf $CHROOT/etc/resolv.conf # Add SLURM and other components to compute instance cp /etc/passwd /etc/group $CHROOT/etc yum -y --installroot=$CHROOT install ohpc-slurm-client +yum -y --installroot=$CHROOT install hwloc-ohpc chroot $CHROOT systemctl enable munge echo SLURMD_OPTIONS="--conf-server ${sms_ip}" > $CHROOT/etc/sysconfig/slurmd yum -y --installroot=$CHROOT install chrony @@ -388,7 +389,7 @@ fi # Boot compute nodes (Section 3.10) # --------------------------------- for ((i=0; i<${num_computes}; i++)) ; do - ipmitool -E -I lanplus -H ${c_bmc[$i]} -U ${bmc_username} -P ${bmc_password} chassis power reset + ipmitool -I lanplus -H ${c_bmc[$i]} -U ${bmc_username} -P ${bmc_password} chassis power reset done # --------------------------------------- @@ -491,4 +492,4 @@ pdsh -w c1 "/usr/sbin/nhc-genconf -H '*' -c -" | dshbak -c useradd -m test wwsh file resync passwd shadow group sleep 2 -pdsh -w $compute_prefix[1-4] /warewulf/bin/wwgetfiles \ No newline at end of file +pdsh -w $compute_prefix[1-4] /warewulf/bin/wwgetfiles