stack/resilient: Switch to monitor-promise-base

stack/resilient/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = f3bf5e1d8bbfbb428c5bbe3a57d8cbe5
+md5sum = b241faeb182193eb105dfe19e45835db
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -26,11 +26,11 @@ md5sum = c6c11db5372150019debb1ce519b907d
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 57b9b421d233402e6d5177c69cf9567e
+md5sum = 881edc84ead2a6de3c919c2f0499d54c
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = 7392935be29d89f8224bccac78e3ecd0
+md5sum = 9372ba0e36cce57892faad4b68fe4b68
 
 [template-parts]
 filename = template-parts.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -42,7 +42,6 @@ log = $${rootdirectory:var}/log
 services = $${rootdirectory:etc}/service
 run = $${rootdirectory:var}/run
 backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
 ssh-home = $${rootdirectory:etc}/ssh
 notifier = $${rootdirectory:etc}/notifier
 
@@ -120,7 +119,6 @@ notifier-binary = ${buildout:bin-directory}/pubsubnotifier
 rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
 sshclient-binary = $${openssh-client:wrapper-path}
 known-hosts = $${directory:dot-ssh}/known_hosts
-promises-directory = $${basedirectory:promises}
 directory = $${directory:pbs-backup}
 cron-entries = $${cron:cron-entries}
 wrappers-directory = $${directory:pbs-wrappers}
@@ -222,22 +220,34 @@ wrapper-path = $${directory:bin}/resilient-genstatrss.py
 recipe = cns.recipe.symlink
 symlink = $${pbs:rdiff-backup-data-folder}/restore.log = $${basedirectory:log}/pbs-push-history-log
 
-[pull-push-stalled-promise]
+[pull-push-stalled-promise-bin]
 recipe = slapos.cookbook:wrapper
 # # time-buffer is 24h (+1h of latitude)
 command-line = ${buildout:bin-directory}/check-feed-as-promise --feed-path $${pbs-resilient-status-feed:feed-path} --title --ok-pattern 'OK' --time-buffer 90000
-wrapper-path = $${basedirectory:promises}/stalled-pull-push
+wrapper-path = $${basedirectory:bin}/stalled-pull-push
 
-[notifier-feed-status-promise]
+[pull-push-stalled-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = stalled-pull-push.py
+config-command = $${pull-push-stalled-promise-bin:wrapper-path}
+
+[notifier-feed-status-promise-bin]
 recipe = slapos.recipe.template:jinja2
 template = ${notifier-feed-promise-template:target}
-rendered = $${basedirectory:promises}/notifier-feed-check-malformed-or-failure.py
+rendered = $${basedirectory:bin}/notifier-feed-check-malformed-or-failure.py
 mode = 700
 context =
   key notifier_feed_directory directory:notifier-feeds
   raw base_url http://[$${notifier:host}]:$${notifier:port}/get/
   raw python_executable ${buildout:executable}
 
+[notifier-feed-status-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = notifier-feed-check-malformed-or-failure.py
+config-command = $${notifier-feed-status-promise-bin:rendered}
+
 #----------------
 #--
 #-- Publish instance parameters.

stack/resilient/pbsready.cfg.in

@@ -40,7 +40,6 @@ services = $${rootdirectory:etc}/service
 run = $${rootdirectory:var}/run
 scripts = $${rootdirectory:etc}/run
 backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
 services = $${rootdirectory:etc}/service
 cache = $${rootdirectory:var}/cache
 notifier = $${rootdirectory:etc}/notifier
@@ -152,11 +151,17 @@ name = resilient-notifier-status-feed
 frequency = */5 * * * *
 command = $${notifier-resilient-status-feed:wrapper-path}
 
-[notifier-stalled-promise]
+[notifier-stalled-promise-bin]
 recipe = slapos.cookbook:wrapper
 # time-buffer is 24h (+1h of latitude)
 command-line = ${buildout:bin-directory}/check-feed-as-promise --feed-path $${notifier-resilient-status-feed:feed-path} --title --ok-pattern 'OK' --time-buffer 90000
-wrapper-path = $${basedirectory:promises}/stalled-notifier-callbacks
+wrapper-path = $${basedirectory:bin}/stalled-notifier-callbacks
+
+[notifier-stalled-promise-bin]
+<= monitor-promise-base
+module = check_command_execute
+name = stalled-notifier-callbacks.py
+config-command = $${notifier-stalled-promise-bin:wrapper-path}
 
 #----------------
 #--
@@ -206,10 +211,11 @@ command-line = $${directory:bin}/killpidfromfile $${resilient-sshd-config:path_p
 wrapper-path = $${basedirectory:scripts}/sshd-graceful
 
 [sshd-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/sshd
-hostname = $${slap-network-information:global-ipv6}
-port = $${sshd-port:port}
+<= monitor-promise-base
+module = check_port_listening
+name = sshd.py
+config-hostname = $${slap-network-information:global-ipv6}
+config-port = $${sshd-port:port}
 
 #----------------
 #--
@@ -237,7 +243,7 @@ public-key = $${sshd-raw-server:rsa-keyfile}.pub
 private-key = $${sshd-raw-server:rsa-keyfile}
 wrapper = $${basedirectory:services}/sshd
 
-[resilient-sshkeys-sshd-promise]
+[resilient-sshkeys-sshd-promise-bin]
 # Check that public key file exists and is not empty
 recipe = collective.recipe.template
 input = inline:#!${bash:location}/bin/bash
@@ -245,23 +251,34 @@ input = inline:#!${bash:location}/bin/bash
   if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
     exit 1
   fi
-output = $${basedirectory:promises}/public-key-existence
+output = $${basedirectory:bin}/public-key-existence
 mode = 700
 
+[resilient-sshkeys-sshd-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = public-key-existence.py
+config-command = $${resilient-sshkeys-sshd-promise-bin:output}
+
 #----------------
 #--
 #-- Promises
 
-[notifier-feed-status-promise]
+[notifier-feed-status-promise-bin]
 recipe = slapos.recipe.template:jinja2
 template = ${notifier-feed-promise-template:target}
-rendered = $${basedirectory:promises}/notifier-feed-check-malformed-or-failure.py
+rendered = $${basedirectory:bin}/notifier-feed-check-malformed-or-failure.py
 mode = 700
 context =
   key notifier_feed_directory directory:notifier-feeds
   raw base_url http://[$${notifier:host}]:$${notifier:port}/get/
   raw python_executable ${buildout:executable}
 
+[notifier-feed-status-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = notifier-feed-check-malformed-or-failure.py
+config-command = $${notifier-feed-status-promise-bin:rendered}
 #----------------
 #--
 #-- Connection informations to re-use.

stack/resilient/template-replicated.cfg.in

@@ -18,7 +18,6 @@
 recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
 etc = ${:home}/etc
-promise = ${:etc}/promise
 
 
 ## Tells the Backupable recipe that we want a backup

[Nicolas Wavrant]

@luke : this commit prevents resilient instances to build :

• $${basedirectory:bin} should be replaced by $${rootdirectory:bin}
• there is now 2 sections with same name notifier-stalled-promise-bin
• section [notifier-exporter-promise] creates an executable in directory ${basedirectory:promises} which doesn't exist anymore.

I stopped trying to fix here because I don't know what are monitor-base-promises.

Could you fix it and revalidate the resilient test suites (see https://www.erp5.com/group_section/forum/Resilience--3-test-suites-invalidated-bGGks6EkGb) ?

[Łukasz Nowak]

Sure, I'll take care of it. Despite I did my best with checking all consequences of my changes, due to lack of SlapOS profile integration test for this SR I missed something here.

I'll revert this commit and redoing it well is my TODO now.