Permalink
Browse files

Merge branch 'master' of github.com:NixOS/charon

  • Loading branch information...
2 parents 4cbb3f4 + e3597bc commit 1b9d0393382e4c6f9826b5455be80194665421b4 @rbvermaa rbvermaa committed May 11, 2012
Showing with 12 additions and 1 deletion.
  1. +11 −0 charon/backends/ec2.py
  2. +1 −1 nix/options.nix
@@ -357,6 +357,17 @@ def create(self, defn, check):
self.write()
+ # There is a short time window during which EC2 doesn't
+ # know the instance ID yet. So wait until it does.
+ while True:
+ try:
+ instance = self._get_instance_by_id(self._instance_id)
+ break
+ except boto.exception.EC2ResponseError as e:
+ if e.error_code != "InvalidInstanceID.NotFound": raise
+ self.log("EC2 instance ‘{0}’ not known yet, waiting...".format(self._instance_id))
+ time.sleep(3)
+
# Reapply tags if they have changed.
common_tags = {'CharonNetworkUUID': str(self.depl.uuid), 'CharonMachineName': self.name}
tags = {'Name': "{0} [{1}]".format(self.depl.description, self.name)}
View
@@ -407,7 +407,7 @@ in
}} > $out
'';
in if config.nixpkgs.system == "x86_64-linux" then
- unpack "r33382-x86_64" "16irymms7vs4l3cllbpfl572269dwmlc7zficzf0r05bx7l0jsax"
+ unpack "0.1pre33926-33924-x86_64" "0c9857e3955bb5af273375e85c0a62a50323ccfaef0a29b5eb7f1539077c1c40"
else
# !!! Stupid lack of laziness
# throw "Unsupported VirtualBox system type!"

0 comments on commit 1b9d039

Please sign in to comment.