Commit c81ec63a authored by Marco Mariani's avatar Marco Mariani

revert 081556ba... and solve it by catching ResourceNotReady

parent c8f39b02
...@@ -138,7 +138,7 @@ class Recipe(object): ...@@ -138,7 +138,7 @@ class Recipe(object):
try: try:
options['connection-%s' % param] = str( options['connection-%s' % param] = str(
self.instance.getConnectionParameter(param)) self.instance.getConnectionParameter(param))
except (slapmodule.NotFoundError, slapmodule.ServerError): except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
options['connection-%s' % param] = '' options['connection-%s' % param] = ''
if self.failed is None: if self.failed is None:
self.failed = param self.failed = param
......
...@@ -242,9 +242,7 @@ path = $${basedirectory:services}/slapreport ...@@ -242,9 +242,7 @@ path = $${basedirectory:services}/slapreport
[publish-connection-informations] [publish-connection-informations]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
backend_url = $${apache-php:url} backend_url = $${apache-php:url}
url = http://www.example.com/ url = $${request-frontend:connection-site_url}
# XXX instances 7 and 8 are not build at all without the above fake url.
#url = $${request-frontend:connection-site_url}
# Deploy promises scripts # Deploy promises scripts
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment