diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2013-01-18 15:43:08 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-01-30 20:03:24 +0000 |
| commit | b62390fb93897d9f873c0d23ddfcd7d2def7204f (patch) | |
| tree | 763fd7d2b9e8c20a0abf19769f406f64ddb47a9d /waagent | |
| parent | 961f38d3d7621d3d6f48d4216fcfb3b3ab806f72 (diff) | |
| download | vyos-walinuxagent-b62390fb93897d9f873c0d23ddfcd7d2def7204f.tar.gz vyos-walinuxagent-b62390fb93897d9f873c0d23ddfcd7d2def7204f.zip | |
Import patches-unapplied version 1.3-0ubuntu1 to ubuntu/raring-proposed
Imported using git-ubuntu import.
Changelog parent: 961f38d3d7621d3d6f48d4216fcfb3b3ab806f72
New changelog entries:
* New upstream version (LP: #1101371)
- Add some error checking and robustness to DVD mounting operation during
provisioning
- Remove redundant check for IP and Port in LoadBalancerProbe
- Add check to self.computername to detect empty hostname in configuration
- Fix manual uninstall on Ubuntu
* Modified walinuxagent to recognize when its been packaged.
Diffstat (limited to 'waagent')
| -rw-r--r-- | waagent | 25 |
1 files changed, 18 insertions, 7 deletions
@@ -47,7 +47,7 @@ import commands GuestAgentName = "WALinuxAgent" GuestAgentLongName = "Windows Azure Linux Agent" -GuestAgentVersion = "WALinuxAgent-1.2" +GuestAgentVersion = "WALinuxAgent-1.3" ProtocolVersion = "2011-12-31" Config = None @@ -166,13 +166,13 @@ def Run(a): return os.system(a) def RunSafe(cmd): - LogIfVerbose(cmd) + Log(cmd) # for python2.1 double try, in order to use a finally... try: try: (exit_status,output) = commands.getstatusoutput(cmd) except OSError,e : # just catch the exception and proceed - LogIfVerbose( ("OSError " + str(e) + " caught") ) + Log( ("OSError " + str(e) + " caught") ) return exit_status,output else: return exit_status,output @@ -549,8 +549,6 @@ def LoadBalancerProbeServer(port): class T(object): def __init__(self, ip, port): - if port == None or ip == None : - return self.ProbeCounter = 0 self.server = SocketServer.TCPServer((ip, port), TCPHandler) self.server_thread = threading.Thread(target = self.server.serve_forever) @@ -1272,6 +1270,8 @@ class OvfEnv(object): def Process(self): error = None + if self.ComputerName == None : + return "Error: Hostname missing" error=WaAgent.EnvMonitor.SetHostName(self.ComputerName) if error: return error if self.DisableSshPasswordAuthentication: @@ -1793,7 +1793,18 @@ class Agent(Util): Log("Waiting for DVD - sleeping 1 - "+str(i+1)+" try...") time.sleep(1) CreateDir("/mnt/cdrom/secure", "root", 0700) - Run("mount " + dvd + " /mnt/cdrom/secure") + #begin mount loop - ten tries - 5 sec wait between + for retry in range(1,11): + retcode,output=RunSafe("mount -v " + dvd + " /mnt/cdrom/secure") + Log(output) + if retcode: + Log("mount failed on attempt #" + str(retry) ) + else: + Log("mount suceed on attempt #" + str(retry) ) + break + Log("mount loop sleeping 5...") + time.sleep(5) + if not os.path.isfile("/mnt/cdrom/secure/ovf-env.xml"): Error("Unable to provision: Missing ovf-env.xml on DVD.") return "Failed to retrieve provisioning data (0x02)." @@ -2304,7 +2315,7 @@ def Uninstall(): "update-rc.d -f " + filename + " remove", "insserv -r " + filename][a - 1] Run(cmd) - for f in os.listdir(LibDir) + ["/etc/init.d/" + filename, "/etc/waagent.conf", "/etc/logrotate.d/waagent", "/etc/sudoers.d/waagent"]: + for f in os.listdir(LibDir) + ["/etc/init/waagent.conf","/etc/init.d/" + filename, "/etc/waagent.conf", "/etc/logrotate.d/waagent", "/etc/sudoers.d/waagent"]: try: os.remove(f) except: |