summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorChris Glass <chris@exoscale.ch>2019-10-24 17:32:58 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-10-24 17:32:58 +0000
commit3e2482e8aa6630ca9bc115dc1f82d44d3fde1681 (patch)
treefa8d507c2819d2160a3250102ef9884f46f8d81c /cloudinit
parent7ccab1bbe508f059e621583c0c05df03c5daaf2b (diff)
downloadvyos-cloud-init-3e2482e8aa6630ca9bc115dc1f82d44d3fde1681.tar.gz
vyos-cloud-init-3e2482e8aa6630ca9bc115dc1f82d44d3fde1681.zip
exoscale: Increase url_max_wait to 120s.
The exoscale datasource defines a shorter timeout than the default (10) but did not override url_max_wait, resulting in a single attempt being made to wait for the metadata service. In some rare cases, a race condition means the route to the metadata service is not set within 10 seconds, and more attempts should be made. This sets the url_max_wait for the datasource to 120.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceExoscale.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceExoscale.py b/cloudinit/sources/DataSourceExoscale.py
index fdfb4ed3..4616daa7 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")