stack/caucase: Switch to monitor-promise-base

software/caddy-frontend/buildout.hash.cfg

@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = bb1eb172e65d8ffe5b161eae191947e1
+md5sum = 9ca8f5fdae2ad5aa9e95aba69c20f820

software/caddy-frontend/instance-kedifa.cfg.in

@@ -36,7 +36,6 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
       service_auto_approve_count=0,
       user_auto_approve_count=1,
       key_len=2048,
-      promise='${directory:promise}/caucased',
 )}}
 
 # Create all needed directories

software/caucase/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [instance-caucased]
 filename = instance-caucased.cfg.jinja2
-md5sum = 442e17a66b6f8d39f87903e147e3edaf
+md5sum = 2277c891a71534e00487468f5048d196
 
 [instance]
 filename = instance.cfg.jinja2

software/caucase/instance-caucased.cfg.jinja2

@@ -4,7 +4,6 @@
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
-promise = ${:etc}/promise
 service-on-watch = ${:etc}/service
 srv = ${buildout:directory}/srv
 
@@ -17,7 +16,6 @@ srv = ${buildout:directory}/srv
   service_auto_approve_count=slapparameter_dict.get('service-auto-approve-amount', 0),
   user_auto_approve_count=slapparameter_dict.get('user-auto-approve-amount', 1),
   key_len=slapparameter_dict.get('key-length', 2048),
-  promise='${directory:promise}/caucased',
 ) }}
 
 [publish]

software/slapos-master/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 70c8d3e4414f6f9f969c9641e840b52f
+md5sum = e46c20fa51e15972b225731b83b09889
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -91,7 +91,6 @@ backup-caucased = ${:srv}/backup/caucased
        service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
        user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
        key_len=caucase_dict.get('key-length', 2048),
-       promise='${directory:promise}/caucased',
 )}}
 {% do root_common.section('caucased') -%}
 {% do root_common.section('caucased-promise') -%}

stack/caucase/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [caucase-jinja2-library]
 filename = caucase.jinja2.library
-md5sum = 5cf324ea1beb593738339f3d20d60a44
+md5sum = 6394dadda5726571149ec1b21207311b

stack/caucase/caucase.jinja2.library

@@ -8,7 +8,7 @@
   user_auto_approve_count=1,
   key_len=None,
   backup_dir=None,
-  promise=None
+  promise=True
 ) -%}
 [{{ prefix }}-directory]
 recipe = slapos.cookbook:mkdirectory
@@ -30,9 +30,10 @@ command-line = '{{ buildout_bin_directory }}/caucased'
 
 {% if promise -%}
 [{{ prefix }}-promise]
-recipe = slapos.cookbook:wrapper
-wrapper-path = {{ promise }}
-command-line = '{{ buildout_bin_directory }}/caucase-probe' 'http://{{ netloc }}'
+<= monitor-promise-base
+module = check_command_execute
+name = {{ prefix }}.py
+config-command = '{{ buildout_bin_directory }}/caucase-probe' 'http://{{ netloc }}'
 {%- endif %}
 {%- endmacro %}
 

stack/erp5/buildout.hash.cfg

@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 4fe42a1fe78ce9531d8e9c9837f4a784
+md5sum = 2ebd2ed8b7db40c4ac6681a8dc0d792a
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -91,7 +91,6 @@ backup-caucased = ${:srv}/backup/caucased
        service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
        user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
        key_len=caucase_dict.get('key-length', 2048),
-       promise='${directory:promise}/caucased',
 )}}
 {% do root_common.section('caucased') -%}
 {% do root_common.section('caucased-promise') -%}