software/cloudooo: make promise check HTTP status code

Checking that something listen on the port is not enough to know when
instance is ready, because apache listen on the port very early. Also,
this does not detect problems on backend.

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 79f2740f7e28ad9fcd2f823d076e790e
+md5sum = 5fc0919cc3eab365f773c6eb73f9c6c3

software/cloudooo/instance-cloudooo.cfg.in

@@ -117,10 +117,12 @@ crl = ${apache-ssl-client:crl}
 [apache-promise]
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
 <= monitor-promise-base
-module = check_port_listening
+module = check_url_available
 name = apache.py
-config-hostname = {{ ipv4 }}
-config-port = {{ apache_dict.values()[0][0] }}
+config-url = https://{{ ipv4 }}:{{ apache_dict.values()[0][0] }}
+# XXX cloudooo replies "400 Bad Request" for GET on / but what we want to check
+# is that we don't have a "503 Service Unavailable" from apache or haproxy.
+config-http_code = 400
 
 [apache-conf-ssl]
 cert = ${directory:apache-conf}/apache.crt