diff options
Diffstat (limited to 'azurelinuxagent/pa/provision')
| -rw-r--r-- | azurelinuxagent/pa/provision/default.py | 4 | ||||
| -rw-r--r-- | azurelinuxagent/pa/provision/ubuntu.py | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/azurelinuxagent/pa/provision/default.py b/azurelinuxagent/pa/provision/default.py index e851036..a99a006 100644 --- a/azurelinuxagent/pa/provision/default.py +++ b/azurelinuxagent/pa/provision/default.py @@ -100,10 +100,10 @@ class ProvisionHandler(object): def provision(self, ovfenv): logger.info("Handle ovf-env.xml.") try: - logger.info("Set host name.") + logger.info("Set hostname [{0}]".format(ovfenv.hostname)) self.osutil.set_hostname(ovfenv.hostname) - logger.info("Publish host name.") + logger.info("Publish hostname [{0}]".format(ovfenv.hostname)) self.osutil.publish_hostname(ovfenv.hostname) self.config_user_account(ovfenv) diff --git a/azurelinuxagent/pa/provision/ubuntu.py b/azurelinuxagent/pa/provision/ubuntu.py index 7f2bce3..a71df37 100644 --- a/azurelinuxagent/pa/provision/ubuntu.py +++ b/azurelinuxagent/pa/provision/ubuntu.py @@ -19,14 +19,12 @@ import os import time -import azurelinuxagent.common.logger as logger -from azurelinuxagent.common.future import ustr + import azurelinuxagent.common.conf as conf -import azurelinuxagent.common.protocol.ovfenv as ovfenv -from azurelinuxagent.common.event import add_event, WALAEventOperation -from azurelinuxagent.common.exception import ProvisionError, ProtocolError -import azurelinuxagent.common.utils.shellutil as shellutil +import azurelinuxagent.common.logger as logger import azurelinuxagent.common.utils.fileutil as fileutil +from azurelinuxagent.common.exception import ProvisionError, ProtocolError +from azurelinuxagent.common.future import ustr from azurelinuxagent.pa.provision.default import ProvisionHandler """ @@ -91,8 +89,14 @@ class UbuntuProvisionHandler(ProvisionHandler): path = '/etc/ssh/ssh_host_{0}_key.pub'.format(keypair_type) for retry in range(0, max_retry): if os.path.isfile(path): - return self.get_ssh_host_key_thumbprint(keypair_type) + logger.info("ssh host key found at: {0}".format(path)) + try: + thumbprint = self.get_ssh_host_key_thumbprint(keypair_type) + logger.info("Thumbprint obtained from : {0}".format(path)) + return thumbprint + except ProvisionError: + logger.warn("Could not get thumbprint from {0}".format(path)) if retry < max_retry - 1: - logger.info("Wait for ssh host key be generated: {0}", path) + logger.info("Wait for ssh host key be generated: {0}".format(path)) time.sleep(5) raise ProvisionError("ssh host key is not generated.") |