Merge branch '3.1-maint'

eucalyptus · Jan 15, 2015 · b4d4d07 · b4d4d07
2 parents 8332144 + a14df16
commit b4d4d07
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/euca2ools/commands/autoscaling/describeautoscalinggroups.py b/euca2ools/commands/autoscaling/describeautoscalinggroups.py
@@ -89,11 +89,11 @@ def print_result(self, result):
                                                                   scale_group))
             for metric in group.get('EnabledMetrics', []):
                 lines.append(self._get_tabified_metric(metric))
-        for tag in result.get('Tags') or []:
-            lines.append(self.tabify(['TAG', tag.get('ResourceType'),
-                                      tag.get('ResourceId'), tag.get('Key'),
-                                      tag.get('Value'),
-                                      tag.get('PropagateAtLaunch')]))
+            for tag in group.get('Tags') or []:
+                lines.append(self.tabify(['TAG', tag.get('ResourceType'),
+                                          tag.get('ResourceId'),
+                                          tag.get('Key'), tag.get('Value'),
+                                          tag.get('PropagateAtLaunch')]))
         for line in lines:
             print line
 

diff --git a/euca2ools/commands/ec2/createvpc.py b/euca2ools/commands/ec2/createvpc.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2014 Eucalyptus Systems, Inc.
+# Copyright 2013-2015 Eucalyptus Systems, Inc.
 #
 # Redistribution and use of this software in source and binary forms,
 # with or without modification, are permitted provided that the following
@@ -32,7 +32,7 @@ class CreateVpc(EC2Request):
     DESCRIPTION = 'Create a new VPC'
     ARGS = [Arg('CidrBlock', metavar='CIDR',
                 help='Address CIDR block for the new VPC (required)'),
-            Arg('--tenancy', dest='instanceTenancy',
+            Arg('--tenancy', dest='InstanceTenancy',
                 choices=('default', 'dedicated'),
                 help='the type of instance tenancy to use')]
     LIST_TAGS = ['tagSet']

diff --git a/euca2ools/commands/ec2/runinstances.py b/euca2ools/commands/ec2/runinstances.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Eucalyptus Systems, Inc.
+# Copyright 2009-2015 Eucalyptus Systems, Inc.
 #
 # Redistribution and use of this software in source and binary forms,
 # with or without modification, are permitted provided that the following
@@ -60,7 +60,8 @@ class RunInstances(EC2Request):
                     help='''file containing user data to make available to the
                     instances in this reservation''')),
             Arg('--addressing', dest='AddressingType',
-                choices=('public', 'private'), help='''[Eucalyptus only]
+                choices=('public', 'private'),
+                help='''[Eucalyptus only, non-VPC only]
                 addressing scheme to launch the instance with.  Use "private"
                 to run an instance with no public address.'''),
             Arg('-t', '--instance-type', dest='InstanceType',

diff --git a/man/euca-run-instances.1 b/man/euca-run-instances.1
@@ -54,9 +54,9 @@ file containing user data to make available to the
 instances in this reservation
 .TP
 \fB\-\-addressing\fR {public,private}
-[Eucalyptus only] addressing scheme to launch the
-instance with. Use "private" to run an instance with
-no public address.
+[Eucalyptus only, non\-VPC only] addressing scheme to
+launch the instance with. Use "private" to run an
+instance with no public address.
 .TP
 \fB\-t\fR INSTANCETYPE, \fB\-\-instance\-type\fR INSTANCETYPE
 type of instance to launch