updated psstore version

GoogleCloudPlatform · Aug 19, 2024 · 829ff3b · 829ff3b
1 parent 8cbd00d
commit 829ff3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/variables.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/variables.tf
@@ -29,10 +29,6 @@ variable "node_conf" {
   description = "Map of Slurm node line configuration."
   type        = map(any)
   default     = {}
-  validation {
-    condition     = lookup(var.node_conf, "Sockets", null) == null
-    error_message = "Sockets and SocketsPerBoard are mutually exclusive parameters. The use of Sockets is now deprecated, please use SocketsPerBoard instead."
-  }
 }
 
 variable "node_count_static" {

diff --git a/modules/file-system/parallelstore/scripts/install-daos-client.sh b/modules/file-system/parallelstore/scripts/install-daos-client.sh
@@ -28,10 +28,10 @@ done
 if grep -q "ID=\"rocky\"" /etc/os-release && lsb_release -rs | grep -q "8\.[0-9]"; then
 
 	# 1) Add the Parallelstore package repository
-	tee /etc/yum.repos.d/parallelstore-v2-4-el8.repo <<EOF
-[parallelstore-v2-4-el8]
-name=Parallelstore EL8 v2.4
-baseurl=https://us-central1-yum.pkg.dev/projects/parallelstore-packages/v2-4-el8
+	tee /etc/yum.repos.d/parallelstore-v2-6-el8.repo <<EOF
+[parallelstore-v2-6-el8]
+name=Parallelstore EL8 v2.6
+baseurl=https://us-central1-yum.pkg.dev/projects/parallelstore-packages/v2-6-el8
 enabled=1
 repo_gpgcheck=0
 gpgcheck=0
@@ -50,7 +50,7 @@ elif (grep -q "ID=ubuntu" /etc/os-release && lsb_release -rs | grep -q "22\.04")
 
 	# 1) Add the Parallelstore package repository
 	curl https://us-central1-apt.pkg.dev/doc/repo-signing-key.gpg | apt-key add -
-	echo "deb https://us-central1-apt.pkg.dev/projects/parallelstore-packages v2-4-deb main" | tee -a /etc/apt/sources.list.d/artifact-registry.list
+	echo "deb https://us-central1-apt.pkg.dev/projects/parallelstore-packages v2-6-deb main" | tee -a /etc/apt/sources.list.d/artifact-registry.list
 
 	apt update
 
@@ -74,7 +74,7 @@ if grep -q "ID=\"rocky\"" /etc/os-release && lsb_release -rs | grep -q "8\.[0-9]
 	# Move agent log destination from /tmp/ (default) to /var/log/daos_agent/
 	mkdir -p /var/log/daos_agent
 	chown daos_agent:daos_agent /var/log/daos_agent
-	sed -i "s/#.*log_file:.*/log_file: \/var\/log\/daos_agent\/daos_agent.log/g" $daos_config	
+	sed -i "s/#.*log_file:.*/log_file: \/var\/log\/daos_agent\/daos_agent.log/g" $daos_config
 	systemctl start daos_agent.service
 
 elif (grep -q "ID=ubuntu" /etc/os-release && lsb_release -rs | grep -q "22\.04") || (grep -q "ID=debian" /etc/os-release && lsb_release -rs | grep -q "12"); then

diff --git a/modules/file-system/pre-existing-network-storage/scripts/install-daos-client.sh b/modules/file-system/pre-existing-network-storage/scripts/install-daos-client.sh
@@ -74,7 +74,7 @@ if grep -q "ID=\"rocky\"" /etc/os-release && lsb_release -rs | grep -q "8\.[0-9]
 	# Move agent log destination from /tmp/ (default) to /var/log/daos_agent/
 	mkdir -p /var/log/daos_agent
 	chown daos_agent:daos_agent /var/log/daos_agent
-	sed -i "s/#.*log_file:.*/log_file: \/var\/log\/daos_agent\/daos_agent.log/g" $daos_config	
+	sed -i "s/#.*log_file:.*/log_file: \/var\/log\/daos_agent\/daos_agent.log/g" $daos_config
 	systemctl start daos_agent.service
 
 elif (grep -q "ID=ubuntu" /etc/os-release && lsb_release -rs | grep -q "22\.04") || (grep -q "ID=debian" /etc/os-release && lsb_release -rs | grep -q "12"); then