summaryrefslogtreecommitdiff
path: root/azurelinuxagent/ga/update.py
diff options
context:
space:
mode:
Diffstat (limited to 'azurelinuxagent/ga/update.py')
-rw-r--r--azurelinuxagent/ga/update.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/azurelinuxagent/ga/update.py b/azurelinuxagent/ga/update.py
index 996484b..59bc70c 100644
--- a/azurelinuxagent/ga/update.py
+++ b/azurelinuxagent/ga/update.py
@@ -701,11 +701,15 @@ class GuestAgent(object):
if self._fetch(uri.uri):
break
else:
- if self.host is not None:
- logger.info("Download unsuccessful, falling back to host plugin")
+ if self.host is not None and self.host.ensure_initialized():
+ logger.warn("Download unsuccessful, falling back to host plugin")
uri, headers = self.host.get_artifact_request(uri.uri, self.host.manifest_uri)
- if self._fetch(uri, headers=headers):
+ if uri is not None \
+ and headers is not None \
+ and self._fetch(uri, headers=headers):
break
+ else:
+ logger.warn("Download unsuccessful, host plugin not available")
if not os.path.isfile(self.get_agent_pkg_path()):
msg = u"Unable to download Agent {0} from any URI".format(self.name)
@@ -730,9 +734,9 @@ class GuestAgent(object):
logger.info(u"Agent {0} downloaded from {1}", self.name, uri)
except restutil.HttpError as http_error:
logger.verbose(u"Agent {0} download from {1} failed [{2}]",
- self.name,
- uri,
- http_error)
+ self.name,
+ uri,
+ http_error)
return package is not None
def _load_error(self):