From e10e24cdb7599a17fb20fd4d31bfd202dfa1774a Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 9 Jul 2010 09:36:01 -0400 Subject: extend list of possible metadata names with 'ebs[0-9]' ec2-run-instances --block-device-mapping /dev/sdd=:1 --block-device-mapping /dev/sde=snap-4cda7b24 --block-device-mapping sdf=snap-d4d90bbc resulted in: 'block-device-mapping': {'ami': '/dev/sda1', 'ebs1': '/dev/sdd', 'ebs2': '/dev/sde', 'ebs3': 'sdf', 'ephemeral0': '/dev/sda2', 'root': '/dev/sda1', 'swap': 'sda3'} --- cloudinit/CloudConfig/cc_mounts.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cloudinit/CloudConfig') diff --git a/cloudinit/CloudConfig/cc_mounts.py b/cloudinit/CloudConfig/cc_mounts.py index 32cfe02e..8177d305 100644 --- a/cloudinit/CloudConfig/cc_mounts.py +++ b/cloudinit/CloudConfig/cc_mounts.py @@ -24,8 +24,12 @@ def is_mdname(name): # return true if this is a metadata service name if name in [ "ami", "root", "swap" ]: return True + # names 'ephemeral0' or 'ephemeral1' + # 'ebs[0-9]' appears when '--block-device-mapping sdf=snap-d4d90bbc' + for enumname in ( "ephemeral", "ebs" ): + if name.startswith(enumname) and name.find(":") == -1: + return True if name.startswith("ephemeral") and name.find(":") == -1: - return True return False def handle(name,cfg,cloud,log,args): -- cgit v1.2.3