cloud-init-dev team mailing list archive

[Chris Glass <tribaal@xxxxxxxxx>]

Chris Glass has proposed merging ~tribaal/cloud-init:fix/exoscale-datasource-wait-timeout into cloud-init:master.

Requested reviews:
  cloud-init Commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~tribaal/cloud-init/+git/cloud-init/+merge/374643

This change sets the url_max_wait for the exoscale datasource to 120 (similar to what is done in the EC2/Cloudstack datasources).

In some rare cases the route to the datasource IP address is not available under 10 seconds (the datasource's default timeout), and not setting url_max_wait results in only a single attempt being made (the default value being -1).
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~tribaal/cloud-init:fix/exoscale-datasource-wait-timeout into cloud-init:master.

diff --git a/cloudinit/sources/DataSourceExoscale.py b/cloudinit/sources/DataSourceExoscale.py
index fdfb4ed..4616daa 100644
--- a/cloudinit/sources/DataSourceExoscale.py
+++ b/cloudinit/sources/DataSourceExoscale.py
@@ -26,6 +26,8 @@ class DataSourceExoscale(sources.DataSource):
 
     dsname = 'Exoscale'
 
+    url_max_wait = 120
+
     def __init__(self, sys_cfg, distro, paths):
         super(DataSourceExoscale, self).__init__(sys_cfg, distro, paths)
         LOG.debug("Initializing the Exoscale datasource")