summaryrefslogtreecommitdiff
path: root/azurelinuxagent/distro/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'azurelinuxagent/distro/ubuntu')
-rw-r--r--azurelinuxagent/distro/ubuntu/deprovision.py3
-rw-r--r--azurelinuxagent/distro/ubuntu/distro.py55
-rw-r--r--azurelinuxagent/distro/ubuntu/handlerFactory.py29
-rw-r--r--azurelinuxagent/distro/ubuntu/loader.py40
-rw-r--r--azurelinuxagent/distro/ubuntu/osutil.py12
-rw-r--r--azurelinuxagent/distro/ubuntu/provision.py71
6 files changed, 105 insertions, 105 deletions
diff --git a/azurelinuxagent/distro/ubuntu/deprovision.py b/azurelinuxagent/distro/ubuntu/deprovision.py
index 0c3c4e5..da6e834 100644
--- a/azurelinuxagent/distro/ubuntu/deprovision.py
+++ b/azurelinuxagent/distro/ubuntu/deprovision.py
@@ -33,6 +33,9 @@ def del_resolv():
class UbuntuDeprovisionHandler(DeprovisionHandler):
+ def __init__(self, distro):
+ super(UbuntuDeprovisionHandler, self).__init__(distro)
+
def setup(self, deluser):
warnings, actions = super(UbuntuDeprovisionHandler, self).setup(deluser)
warnings.append("WARNING! Nameserver configuration in "
diff --git a/azurelinuxagent/distro/ubuntu/distro.py b/azurelinuxagent/distro/ubuntu/distro.py
new file mode 100644
index 0000000..f380f6c
--- /dev/null
+++ b/azurelinuxagent/distro/ubuntu/distro.py
@@ -0,0 +1,55 @@
+# Microsoft Azure Linux Agent
+#
+# Copyright 2014 Microsoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Requires Python 2.4+ and Openssl 1.0+
+#
+
+from azurelinuxagent.distro.default.distro import DefaultDistro
+from azurelinuxagent.distro.ubuntu.osutil import Ubuntu14OSUtil, \
+ Ubuntu12OSUtil, \
+ UbuntuOSUtil, \
+ UbuntuSnappyOSUtil
+
+from azurelinuxagent.distro.ubuntu.provision import UbuntuProvisionHandler
+from azurelinuxagent.distro.ubuntu.deprovision import UbuntuDeprovisionHandler
+
+class UbuntuDistro(DefaultDistro):
+ def __init__(self):
+ super(UbuntuDistro, self).__init__()
+ self.osutil = UbuntuOSUtil()
+ self.provision_handler = UbuntuProvisionHandler(self)
+ self.deprovision_handler = UbuntuDeprovisionHandler(self)
+
+class Ubuntu12Distro(DefaultDistro):
+ def __init__(self):
+ super(Ubuntu12Distro, self).__init__()
+ self.osutil = Ubuntu12OSUtil()
+ self.provision_handler = UbuntuProvisionHandler(self)
+ self.deprovision_handler = UbuntuDeprovisionHandler(self)
+
+class Ubuntu14Distro(DefaultDistro):
+ def __init__(self):
+ super(Ubuntu14Distro, self).__init__()
+ self.osutil = Ubuntu14OSUtil()
+ self.provision_handler = UbuntuProvisionHandler(self)
+ self.deprovision_handler = UbuntuDeprovisionHandler(self)
+
+class UbuntuSnappyDistro(DefaultDistro):
+ def __init__(self):
+ super(UbuntuSnappyDistro, self).__init__()
+ self.osutil = UbuntuSnappyOSUtil()
+ self.provision_handler = UbuntuProvisionHandler(self)
+ self.deprovision_handler = UbuntuDeprovisionHandler(self)
diff --git a/azurelinuxagent/distro/ubuntu/handlerFactory.py b/azurelinuxagent/distro/ubuntu/handlerFactory.py
deleted file mode 100644
index 11f7f04..0000000
--- a/azurelinuxagent/distro/ubuntu/handlerFactory.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Microsoft Azure Linux Agent
-#
-# Copyright 2014 Microsoft Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Requires Python 2.4+ and Openssl 1.0+
-#
-
-from azurelinuxagent.distro.ubuntu.provision import UbuntuProvisionHandler
-from azurelinuxagent.distro.ubuntu.deprovision import UbuntuDeprovisionHandler
-from azurelinuxagent.distro.default.handlerFactory import DefaultHandlerFactory
-
-class UbuntuHandlerFactory(DefaultHandlerFactory):
- def __init__(self):
- super(UbuntuHandlerFactory, self).__init__()
- self.provision_handler = UbuntuProvisionHandler()
- self.deprovision_handler = UbuntuDeprovisionHandler()
-
diff --git a/azurelinuxagent/distro/ubuntu/loader.py b/azurelinuxagent/distro/ubuntu/loader.py
deleted file mode 100644
index 3fe2239..0000000
--- a/azurelinuxagent/distro/ubuntu/loader.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Microsoft Azure Linux Agent
-#
-# Copyright 2014 Microsoft Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Requires Python 2.4+ and Openssl 1.0+
-#
-
-from azurelinuxagent.metadata import DISTRO_NAME, DISTRO_VERSION, DISTRO_FULL_NAME
-
-def get_osutil():
- from azurelinuxagent.distro.ubuntu.osutil import Ubuntu1204OSUtil, \
- UbuntuOSUtil, \
- Ubuntu14xOSUtil, \
- UbuntuSnappyOSUtil
-
- if DISTRO_VERSION == "12.04":
- return Ubuntu1204OSUtil()
- elif DISTRO_VERSION == "14.04" or DISTRO_VERSION == "14.10":
- return Ubuntu14xOSUtil()
- elif DISTRO_FULL_NAME == "Snappy Ubuntu Core":
- return UbuntuSnappyOSUtil()
- else:
- return UbuntuOSUtil()
-
-def get_handlers():
- from azurelinuxagent.distro.ubuntu.handlerFactory import UbuntuHandlerFactory
- return UbuntuHandlerFactory()
-
diff --git a/azurelinuxagent/distro/ubuntu/osutil.py b/azurelinuxagent/distro/ubuntu/osutil.py
index adf7660..cc4b8ef 100644
--- a/azurelinuxagent/distro/ubuntu/osutil.py
+++ b/azurelinuxagent/distro/ubuntu/osutil.py
@@ -31,9 +31,9 @@ import azurelinuxagent.utils.shellutil as shellutil
import azurelinuxagent.utils.textutil as textutil
from azurelinuxagent.distro.default.osutil import DefaultOSUtil
-class Ubuntu14xOSUtil(DefaultOSUtil):
+class Ubuntu14OSUtil(DefaultOSUtil):
def __init__(self):
- super(Ubuntu14xOSUtil, self).__init__()
+ super(Ubuntu14OSUtil, self).__init__()
def start_network(self):
return shellutil.run("service networking start", chk_err=False)
@@ -44,16 +44,16 @@ class Ubuntu14xOSUtil(DefaultOSUtil):
def start_agent_service(self):
return shellutil.run("service walinuxagent start", chk_err=False)
-class Ubuntu1204OSUtil(Ubuntu14xOSUtil):
+class Ubuntu12OSUtil(Ubuntu14OSUtil):
def __init__(self):
- super(Ubuntu1204OSUtil, self).__init__()
+ super(Ubuntu12OSUtil, self).__init__()
#Override
def get_dhcp_pid(self):
ret= shellutil.run_get_output("pidof dhclient3")
return ret[1] if ret[0] == 0 else None
-class UbuntuOSUtil(Ubuntu14xOSUtil):
+class UbuntuOSUtil(Ubuntu14OSUtil):
def __init__(self):
super(UbuntuOSUtil, self).__init__()
@@ -63,7 +63,7 @@ class UbuntuOSUtil(Ubuntu14xOSUtil):
def unregister_agent_service(self):
return shellutil.run("systemctl mask walinuxagent", chk_err=False)
-class UbuntuSnappyOSUtil(Ubuntu14xOSUtil):
+class UbuntuSnappyOSUtil(Ubuntu14OSUtil):
def __init__(self):
super(UbuntuSnappyOSUtil, self).__init__()
self.conf_file_path = '/apps/walinuxagent/current/waagent.conf'
diff --git a/azurelinuxagent/distro/ubuntu/provision.py b/azurelinuxagent/distro/ubuntu/provision.py
index a68fe4d..330e057 100644
--- a/azurelinuxagent/distro/ubuntu/provision.py
+++ b/azurelinuxagent/distro/ubuntu/provision.py
@@ -20,12 +20,11 @@
import os
import time
import azurelinuxagent.logger as logger
-from azurelinuxagent.future import text
+from azurelinuxagent.future import ustr
import azurelinuxagent.conf as conf
-import azurelinuxagent.protocol as prot
+import azurelinuxagent.protocol.ovfenv as ovfenv
from azurelinuxagent.event import add_event, WALAEventOperation
-from azurelinuxagent.exception import *
-from azurelinuxagent.utils.osutil import OSUTIL
+from azurelinuxagent.exception import ProvisionError, ProtocolError
import azurelinuxagent.utils.shellutil as shellutil
import azurelinuxagent.utils.fileutil as fileutil
from azurelinuxagent.distro.default.provision import ProvisionHandler
@@ -34,49 +33,61 @@ from azurelinuxagent.distro.default.provision import ProvisionHandler
On ubuntu image, provision could be disabled.
"""
class UbuntuProvisionHandler(ProvisionHandler):
- def process(self):
+ def __init__(self, distro):
+ self.distro = distro
+
+ def run(self):
#If provision is enabled, run default provision handler
- if conf.get_switch("Provisioning.Enabled", False):
- super(UbuntuProvisionHandler, self).process()
+ if conf.get_provision_enabled():
+ super(UbuntuProvisionHandler, self).run()
return
logger.info("run Ubuntu provision handler")
- provisioned = os.path.join(OSUTIL.get_lib_dir(), "provisioned")
+ provisioned = os.path.join(conf.get_lib_dir(), "provisioned")
if os.path.isfile(provisioned):
return
- logger.info("Waiting cloud-init to finish provisioning.")
- protocol = prot.FACTORY.get_default_protocol()
+ logger.info("Waiting cloud-init to copy ovf-env.xml.")
+ self.wait_for_ovfenv()
+
+ protocol = self.distro.protocol_util.detect_protocol()
+ self.report_not_ready("Provisioning", "Starting")
+ logger.info("Sleep 15 seconds to prevent throttling")
+ time.sleep(15) #Sleep to prevent throttling
try:
logger.info("Wait for ssh host key to be generated.")
thumbprint = self.wait_for_ssh_host_key()
fileutil.write_file(provisioned, "")
-
logger.info("Finished provisioning")
- status = prot.ProvisionStatus(status="Ready")
- status.properties.certificateThumbprint = thumbprint
- try:
- protocol.report_provision_status(status)
- except prot.ProtocolError as pe:
- add_event(name="WALA", is_success=False, message=text(pe),
- op=WALAEventOperation.Provision)
-
+
except ProvisionError as e:
logger.error("Provision failed: {0}", e)
- status = prot.ProvisionStatus(status="NotReady",
- subStatus="ProvisioningFailed",
- description= text(e))
- try:
- protocol.report_provision_status(status)
- except prot.ProtocolError as pe:
- add_event(name="WALA", is_success=False, message=text(pe),
- op=WALAEventOperation.Provision)
+ self.report_not_ready("ProvisioningFailed", ustr(e))
+ self.report_event(ustr(e))
+ return
+
+ self.report_ready(thumbprint)
+ self.report_event("Provision succeed", is_success=True)
- add_event(name="WALA", is_success=False, message=text(e),
- op=WALAEventOperation.Provision)
+ def wait_for_ovfenv(self, max_retry=60):
+ """
+ Wait for cloud-init to copy ovf-env.xml file from provision ISO
+ """
+ for retry in range(0, max_retry):
+ try:
+ self.distro.protocol_util.get_ovf_env()
+ return
+ except ProtocolError:
+ if retry < max_retry - 1:
+ logger.info("Wait for cloud-init to copy ovf-env.xml")
+ time.sleep(5)
+ raise ProvisionError("ovf-env.xml is not copied")
def wait_for_ssh_host_key(self, max_retry=60):
- kepair_type = conf.get("Provisioning.SshHostKeyPairType", "rsa")
+ """
+ Wait for cloud-init to generate ssh host key
+ """
+ kepair_type = conf.get_ssh_host_keypair_type()
path = '/etc/ssh/ssh_host_{0}_key'.format(kepair_type)
for retry in range(0, max_retry):
if os.path.isfile(path):
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-18 17:49:58 +0000