software/seleniumserver: Switch to monitor-promise-base

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 7c1a5a4f1a3916ddf3ec0db7b22ef820
+md5sum = 4f557a7b3aa9b4df1ca1fa6a754ca657

software/seleniumserver/instance-selenium.cfg.in

 [buildout]
 parts =
+  monitor-base
   promises
   publish-connection-parameter
 
+extends = ${monitor-template:rendered}
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory} 
 offline = true
@@ -237,53 +239,54 @@ command = mkdir -p $${:location} && echo '$${instance-parameter:configuration.ss
 [promises]
 recipe =
 instance-promises =
-  $${sshd-listen-promise:path}
-  $${selenium-server-frontend-listen-promise:path}
-  $${selenium-server-hub-listen-promise:path}
-  $${selenium-server-node-firefox-52-listen-promise:path}
-  $${selenium-server-node-firefox-60-listen-promise:path}
-  $${selenium-server-node-firefox-68-listen-promise:path}
-  $${selenium-server-node-instance-chromium-69-listen-promise:path}
+  $${sshd-listen-promise:name}
+  $${selenium-server-frontend-listen-promise:name}
+  $${selenium-server-hub-listen-promise:name}
+  $${selenium-server-node-firefox-52-listen-promise:name}
+  $${selenium-server-node-firefox-60-listen-promise:name}
+  $${selenium-server-node-firefox-68-listen-promise:name}
+  $${selenium-server-node-instance-chromium-69-listen-promise:name}
 
 
 [check-port-listening-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/$${:_buildout_section_name_}
+<= monitor-promise-base
+module = check_port_listening
+name = $${:_buildout_section_name_}.py
 
 [sshd-listen-promise]
 <= check-port-listening-promise
-hostname = $${sshd-address:hostname}
-port = $${sshd-address:port}
+config-hostname = $${sshd-address:hostname}
+config-port = $${sshd-address:port}
 
 [selenium-server-frontend-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-frontend-instance:ip}
-port = $${selenium-server-frontend-instance:port}
+config-hostname = $${selenium-server-frontend-instance:ip}
+config-port = $${selenium-server-frontend-instance:port}
 
 [selenium-server-hub-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-hub-instance:hostname}
-port = $${selenium-server-hub-instance:port}
+config-hostname = $${selenium-server-hub-instance:hostname}
+config-port = $${selenium-server-hub-instance:port}
 
 [selenium-server-node-firefox-52-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-node-instance-firefox-52:hostname}
-port = $${selenium-server-node-instance-firefox-52:port}
+config-hostname = $${selenium-server-node-instance-firefox-52:hostname}
+config-port = $${selenium-server-node-instance-firefox-52:port}
 
 [selenium-server-node-firefox-60-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-node-instance-firefox-60:hostname}
-port = $${selenium-server-node-instance-firefox-60:port}
+config-hostname = $${selenium-server-node-instance-firefox-60:hostname}
+config-port = $${selenium-server-node-instance-firefox-60:port}
 
 [selenium-server-node-firefox-68-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-node-instance-firefox-68:hostname}
-port = $${selenium-server-node-instance-firefox-68:port}
+config-hostname = $${selenium-server-node-instance-firefox-68:hostname}
+config-port = $${selenium-server-node-instance-firefox-68:port}
 
 [selenium-server-node-instance-chromium-69-listen-promise]
 <= check-port-listening-promise
-hostname = $${selenium-server-node-instance-chromium-69:hostname}
-port = $${selenium-server-node-instance-chromium-69:port}
+config-hostname = $${selenium-server-node-instance-chromium-69:hostname}
+config-port = $${selenium-server-node-instance-chromium-69:port}
 
 
 [publish-connection-parameter]
@@ -321,7 +324,6 @@ bin = $${buildout:directory}/bin
 tmp = $${buildout:directory}/tmp
 
 services = $${:etc}/service
-promises = $${:etc}/promise
 framebuffer = $${:srv}/framebuffer
 fonts = $${:srv}/fonts/
 ssh = $${:etc}/ssh

software/seleniumserver/software.cfg

@@ -14,6 +14,7 @@ extends =
    ../../component/openssh/buildout.cfg
    ../../stack/slapos.cfg
    ./buildout.hash.cfg
+   ../../stack/monitor/buildout.cfg
 
 parts =
   slapos-cookbook