repman: use python 3

software/repman/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = af2fc4a7a0f782fed2cb1112ef3cb397
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = e2cee0c297ecd19573cb47159561d276
+md5sum = a099b0f693b2efe419aff3d9a2b3210d
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
 
 [template-mariadb.cfg]
 _update_hash_filename_ = instance-mariadb.cfg.jinja2.in
-md5sum = 33c7e5a4039744127ed4ebefc5b1d9a7
+md5sum = 94577526d8f2369a16c55ce2e4287c1d
 
 [template-my-cnf]
 _update_hash_filename_ = templates/my.cnf.in

software/repman/instance-mariadb.cfg.jinja2.in

@@ -21,7 +21,7 @@ database-host = {{ host }}:{{ port }}
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 partition-path = ${buildout:directory}
 receiver-port = ${dbjob-parameter:socat-port}
-csr-id = ${caucase-csr-id:csr_id}
+csr-id = ${caucase-csr-id:csr-id}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -87,22 +87,25 @@ recipe = plone.recipe.command
 output = ${directory:tmp}/csr_id
 command = 
   if [ -s "${mysql-directory:ssl}/server-cert.pem" ]; then
-    echo "None" > ${:output};
+    RESULT="None";
   else
     if [ -f "${caucase-updater-csr:csr}" ]; then
-      result=$({{ caucase_bin_client }} --ca-url {{ slapparameter_dict['caucase-url'] }} --send-csr ${caucase-updater-csr:csr} | cut -d ' ' -f1)
+      RESULT=$({{ caucase_bin_client }} --ca-url {{ slapparameter_dict['caucase-url'] }} --send-csr ${caucase-updater-csr:csr} | cut -d ' ' -f1)
       if [ ! $? -eq 0 ]; then
-        $result="None";
+        RESULT="None";
       fi
-      echo "$result" > ${:output}
     fi
   fi
+  cat <<EOF > ${:output}
+  [caucase]
+  csr-id = $(echo $RESULT)
+  EOF
 update-command = ${:command}
 
 [caucase-csr-id]
-recipe = collective.recipe.shelloutput
-commands = 
-  csr_id = if [ -f "${get-csr-id:output}" ]; then cat ${get-csr-id:output}; fi
+recipe = slapos.cookbook:zero-knowledge.read
+file-path = ${get-csr-id:output}
+csr-id =
 
 [my-cnf-parameters]
 socket = ${directory:run}/mariadb.sock

software/repman/instance-repman.cfg.jinja2.in

@@ -409,7 +409,7 @@ template =
   cp ${directory:ssl}/caucase.user.key ${directory:ssl}/caucase-full.key
   cat ${directory:ssl}/caucase.user.crt >> ${directory:ssl}/caucase-full.key
   for csr_id in {{ csrid_list | join(' ') }}; do
-    if [ "$csr_id" = "None" ]; then
+    if [ "$csr_id" = "None" ] || [ -z "$csr_id"]; then
       continue
     fi
     {{ buildout_bin_directory }}/caucase --ca-url {{ caucase_url }} --user-key ${directory:ssl}/caucase-full.key --sign-csr $csr_id

software/repman/software.cfg

@@ -36,16 +36,12 @@ parts =
 location = ${mariadb-10.4:location}
 
 [python]
-part = python2.7
+part = python3
 
 [gowork]
 # replication-manager does not build on golang 1.17
 golang = ${golang1.16:location}
 
-[monitor-eggs]
-eggs +=
-  collective.recipe.shelloutput
-
 
 [template-mysqld-wrapper]
 recipe = slapos.recipe.template:jinja2