Merge pull request #1727 from stdweird/metaconfig_leftovers

ncm-metaconfig: upstream minor schema changes
quattor · Nov 6, 2024 · 15c3f27 · 15c3f27
2 parents 6a63bb9 + 554514e
commit 15c3f27
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/kafka/pan/config.pan b/ncm-metaconfig/src/main/metaconfig/kafka/pan/config.pan
@@ -10,3 +10,4 @@ prefix "/software/components/metaconfig/services/{/etc/kafka/server.properties}"
 "group" = "root";
 "daemons/kafka" = "restart";
 "module" = "properties";
+"convert/joincomma" = true;
diff --git a/ncm-metaconfig/src/main/metaconfig/kafka/tests/profiles/config.pan b/ncm-metaconfig/src/main/metaconfig/kafka/tests/profiles/config.pan
@@ -50,3 +50,4 @@ prefix "/software/components/metaconfig/services/{/etc/kafka/server.properties}/
 "inter.broker.listener.name" = "INTERNAL";
 "zookeeper.connect" = KAFKA_ZOOKEEPER_SERVERS;
 "log.dirs" = KAFKA_DATA_DIR;
+"sasl.enabled.mechanisms" = list('MECH1', 'MECH2');
diff --git a/ncm-metaconfig/src/main/metaconfig/kafka/tests/regexps/config/base b/ncm-metaconfig/src/main/metaconfig/kafka/tests/regexps/config/base
@@ -8,4 +8,5 @@ Base test for config
 ^listener.security.protocol.map=EXTERNAL:PLAINTEXT,INTERNAL:PLAINTEXT,EXTERNAL_LOG:PLAINTEXT$
 ^listeners=INTERNAL://kafka.cluster.log:9092,EXTERNAL://kafka.cluster.os:9093,EXTERNAL_LOG://kafka.cluster.log:9094$
 ^log.dirs=/var/lib/kafka$
+^sasl.enabled.mechanisms=MECH1,MECH2$
 ^zookeeper.connect=zk1.cluster.log,zk2.cluster.log$
diff --git a/ncm-metaconfig/src/main/metaconfig/mailrc/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/mailrc/pan/schema.pan
@@ -6,6 +6,7 @@ type mailrc_element = {
     'smtp' ? string
     'from' ? type_email
     'smtp-use-starttls' ? boolean
+    'smtp-auth' ? string_trimmed
     'smtp-auth-user' ? string
     'smtp-auth-password' ? string
     'nss-config-dir' ? string

diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_23.02.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_23.02.pan
@@ -628,7 +628,7 @@ type slurm_conf_partition = {
     'MaxTime' ? long(0..)
     'MinNodes' ? long(0..)
     'Nodes' ? string[]
-    'OverSubscribe' ? choice('EXCLUSIVE', 'FORCE', 'YES', 'NO')
+    'OverSubscribe' ? string with match(SELF, '^(EXCLUSIVE|FORCE(:\d+)?|YES|NO)$')
     'PartitionName' ? string
     'PreemptMode' ? choice('OFF', 'CANCEL', 'CHECKPOINT', 'GANG', 'REQUEUE', 'SUSPEND')
     'PriorityJobFactor' ? long(0..65533)

diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_24.05.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_24.05.pan
@@ -631,7 +631,7 @@ type slurm_conf_partition = {
     'MaxTime' ? long(0..)
     'MinNodes' ? long(0..)
     'Nodes' ? string[]
-    'OverSubscribe' ? choice('EXCLUSIVE', 'FORCE', 'YES', 'NO')
+    'OverSubscribe' ? string with match(SELF, '^(EXCLUSIVE|FORCE(:\d+)?|YES|NO)$')
     'PartitionName' ? string
     'PreemptMode' ? choice('OFF', 'CANCEL', 'CHECKPOINT', 'GANG', 'REQUEUE', 'SUSPEND')
     'PriorityJobFactor' ? long(0..65533)

diff --git a/ncm-metaconfig/src/main/metaconfig/zkrsync/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/zkrsync/pan/schema.pan
@@ -35,6 +35,7 @@ type zkrsync_config = {
     'hardlinks' ? boolean = false
     'inplace' ? boolean = false
     'timeout' ? long(0..)
+    'arbitopts' ? string_trimmed
     # client opts
     'verifypath' ? boolean = true
     'domain' ? string