diff --git a/ansible/roles/OFED/files/MLNX_OFED_SRC-5.6-1.0.3.3.tgz b/ansible/roles/OFED/files/MLNX_OFED_SRC-5.6-1.0.3.3.tgz new file mode 100644 index 00000000..f2463073 Binary files /dev/null and b/ansible/roles/OFED/files/MLNX_OFED_SRC-5.6-1.0.3.3.tgz differ diff --git a/ansible/roles/OFED/files/mft-4.20.0-34-x86_64-rpm.tgz b/ansible/roles/OFED/files/mft-4.20.0-34-x86_64-rpm.tgz new file mode 100644 index 00000000..24fd45ae Binary files /dev/null and b/ansible/roles/OFED/files/mft-4.20.0-34-x86_64-rpm.tgz differ diff --git a/ansible/roles/OFED/tasks/main.yml b/ansible/roles/OFED/tasks/main.yml index e6d5a255..f65ccf74 100644 --- a/ansible/roles/OFED/tasks/main.yml +++ b/ansible/roles/OFED/tasks/main.yml @@ -12,7 +12,7 @@ ######TSG-X-P0804 install start###### - name: "unarchive OFED installer" unarchive: - src: /tmp/OFED/MLNX_OFED_LINUX-5.5-1.0.3.2-rhel8.5-x86_64-ext.tgz + src: /tmp/OFED/MLNX_OFED_SRC-5.6-1.0.3.3.tgz dest: /tmp/OFED/unarchived/ remote_src: yes when: runtime_env == 'TSG-X-P0804' @@ -23,8 +23,20 @@ when: runtime_env == 'TSG-X-P0804' - name: "execute OFED installer" - shell: /tmp/OFED/unarchived/MLNX_OFED_LINUX-5.5-1.0.3.2-rhel8.5-x86_64-ext/mlnxofedinstall -k {{obtain_kernel_version.stdout}} --distro rhel8.5 --force --add-kernel-support + shell: /tmp/OFED/unarchived/MLNX_OFED_SRC-5.6-1.0.3.3/install.pl -k {{obtain_kernel_version.stdout}} --all --force when: runtime_env == 'TSG-X-P0804' + +- name: "unarchive MFT RPM" + unarchive: + src: /tmp/OFED/mft-4.20.0-34-x86_64-rpm.tgz + dest: /tmp/OFED/unarchived/ + remote_src: yes + when: runtime_env == 'TSG-X-P0804' + +- name: "execute MFT installer" + shell: /tmp/OFED/unarchived/mft-4.20.0-34-x86_64-rpm/install.sh + when: runtime_env == 'TSG-X-P0804' + ######TSG-X-P0804 install end ###### ######TSG-X-P1403 install start###### diff --git a/conf/yum-RockyLinux-8.conf b/conf/yum-RockyLinux-8.conf index 88f45dc9..bc073e9e 100644 --- a/conf/yum-RockyLinux-8.conf +++ b/conf/yum-RockyLinux-8.conf @@ -33,13 +33,8 @@ gpgcheck=0 name=RockyLinux-8 - PowerTools - mirrors.aliyun.com baseurl=http://mirrors.aliyun.com/rockylinux/8.5/PowerTools/x86_64/os/ gpgcheck=1 -gpgkey=http://mirrors.aliyun.com/rockylinux/8.5/PowerTools/x86_64/os/RPM-GPG-KEY-rockyofficial - -[PowerTools] -name=RockyLinux-8 - PowerTools - mirrors.aliyun.com -baseurl=http://mirrors.aliyun.com/rockylinux/8.5/BaseOS/x86_64/debug/tree/ enabled=1 -gpgcheck=0 +gpgkey=http://mirrors.aliyun.com/rockylinux/8/PowerTools/x86_64/os/RPM-GPG-KEY-rockyofficial [epel] name=Extra Packages for Enterprise Linux 8 - x86_64 diff --git a/tools/mk-base-image b/tools/mk-base-image index c5f9c4b2..55bb4501 100755 --- a/tools/mk-base-image +++ b/tools/mk-base-image @@ -24,11 +24,12 @@ package_to_install_CentOS7="@base @core @debugging @directory-client @guest-agen @hardware-monitoring @network-file-system-client @performance @remote-system-management grub2 epel-release efibootmgr ansible yum-utils ipmitool docker-ce docker-ce-cli containerd.io lrzsz python3 vconfig watchdog pcm git tmux fish" -package_to_install_RockyLinux85="@base @core @debugging @anaconda-tools @additional-devel @guest-agents @system-tools +package_to_install_RockyLinux85="@base @core @debugging @anaconda-tools @additional-devel @guest-agents @system-tools @hardware-monitoring @network-file-system-client @performance @remote-system-management - adcli certmonger ipa-client clevis-dracut clevis-udisks2 krb5-pkinit krb5-workstation sssd-polkit-rules krb5-pkinit luksmeta nscd nss-pam-ldapd + adcli certmonger ipa-client clevis-dracut clevis-udisks2 krb5-pkinit krb5-workstation sssd-polkit-rules krb5-pkinit luksmeta nscd nss-pam-ldapd grub2 epel-release efibootmgr ansible yum-utils ipmitool OpenIPMI docker-ce docker-ce-cli containerd.io lrzsz python3 watchdog pcm git tmux fish kernel kernel-devel - kernel-tools-libs kernel-modules kernel-tools kernel-core rpm-build libtool kernel-rpm-macros python36-devel tcsh kernel-modules-extra gcc-gfortran libnsl" + kernel-tools-libs kernel-modules kernel-tools kernel-core rpm-build libtool kernel-rpm-macros python36-devel tcsh kernel-modules-extra gcc-gfortran + libdb-devel fuse-devel python3-Cython cmake perl-generators libstdc++-devel libmnl-devel bison flex gcc-c++ python3-docutils" if [ $profile_id != "TSG-X-NXR620G40-R01-P0804" ];then locak_package_to_install_CentOS7="$projectdir/package/kernel-lt-$kernel_version.rpm @@ -105,12 +106,18 @@ cp -rf $projectdir/rootconf/sysroot-usr/sysctl/* $target/usr/lib/sysctl.d/ ln -vfs --relative $target/usr/lib/systemd/system/ldconfig.service $target/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service #tty audit using pam -mv $target/etc/pam.d/system-auth $target/etc/pam.d/system-auth-local -mv $target/etc/pam.d/password-auth $target/etc/pam.d/password-auth-local -echo "session required pam_tty_audit.so enable=*" >> $target/etc/pam.d/system-auth-local -echo "session required pam_tty_audit.so enable=*" >> $target/etc/pam.d/password-auth-local -ln -vfs --relative $target/etc/pam.d/system-auth-local $target/etc/pam.d/system-auth -ln -vfs --relative $target/etc/pam.d/password-auth-local $target/etc/pam.d/password-auth +if [ ! -f "$target/etc/pam.d/system-auth-local" ]; then + mv $target/etc/pam.d/system-auth $target/etc/pam.d/system-auth-local + echo "session required pam_tty_audit.so enable=*" >> $target/etc/pam.d/system-auth-local + ln -vfs --relative $target/etc/pam.d/system-auth-local $target/etc/pam.d/system-auth + +fi + +if [ ! -f "$target/etc/pam.d/password-auth-local" ]; then + mv $target/etc/pam.d/password-auth $target/etc/pam.d/password-auth-local + echo "session required pam_tty_audit.so enable=*" >> $target/etc/pam.d/password-auth-local + ln -vfs --relative $target/etc/pam.d/password-auth-local $target/etc/pam.d/password-auth +fi cp -rf $projectdir/rootconf/sysroot-usr/target/* $target/usr/lib/systemd/system mkdir -p $target/usr/lib/systemd/system/workload.target.wants