software/nayuos: Switch to monitor-promise-base

software/nayuos/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [template-instance]
 filename = instance.cfg
-md5sum = 7e9deae78923ab7805c0d10d0d6fe336
+md5sum = ae26da39d6a156a6164782086d6aa00d

software/nayuos/instance.cfg

@@ -6,12 +6,14 @@
 
 [buildout]
 parts =
+  monitor-base
   parameters
   promise-sudo-on-host
   template-full-build-script
   template-sudo-wrapper
   template-cros-sdk-wrapper
 
+extends = {{ monitor_template }}
 # standard declaration of eggs directories
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -54,7 +56,6 @@ cert = ${slap_connection:cert_file}
 recipe = slapos.cookbook:mkdirectory
 log = ${buildout:directory}/var/log
 run = ${buildout:directory}/etc/run
-promise = ${buildout:directory}/etc/promise
 wrapper_dir = ${buildout:directory}/wrapper_bin
 cros_location = ${buildout:directory}/parts/chromiumos
 
@@ -64,12 +65,18 @@ wrapper_cros_sdk=${directory:wrapper_dir}/wrapper_cros_sdk
 bash=/bin/bash
 sudo=/usr/bin/sudo
 
-[promise-sudo-on-host]
-# assert sudo is installed, as it is required to enter the chroot 'cros_sdk'
+[promise-sudo-on-host-bin]
 recipe  = slapos.cookbook:wrapper
-wrapper-path = ${directory:promise}/${:_buildout_section_name_}
+wrapper-path = ${directory:bin}/${:_buildout_section_name_}
 command-line = sudo -V
 
+[promise-sudo-on-host]
+# assert sudo is installed, as it is required to enter the chroot 'cros_sdk'
+<= monitor-promise-base
+module = check_command_execute
+name = ${:_buildout_section_name_}.py
+config-command = ${promise-sudo-on-host-bin:wrapper-path}
+
 [template-sudo-wrapper]
 recipe = slapos.recipe.template:jinja2
 template = {{ software_dir }}/scripts/wrapper_sudo.in

software/nayuos/software.cfg

@@ -3,6 +3,7 @@ extends =
   buildout.hash.cfg
 # basic needs
   ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
   ../../component/automake/buildout.cfg
   ../../component/libexpat/buildout.cfg
   ../../component/libaio/buildout.cfg
@@ -35,6 +36,7 @@ context =
   key eggs_directory          buildout:eggs-directory
   key develop_eggs_directory  buildout:develop-eggs-directory
   key thin_provisioning_tools thin-provisioning-tools:location
+  key monitor_template        monitor2-template:rendered
 
 [thin-provisioning-tools]
 recipe = slapos.recipe.cmmi