[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 832a1b0ebc96706c73045839c158044ee36cba02
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue May 7 16:59:54 2013 -0700

    Simplify "admin only" wording

diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 82ede1f..d731758 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -85,8 +85,7 @@ class EuareRequest(requestbuilder.request.AWSQueryRequest):
             return response_dict
 
 AS_ACCOUNT = [Arg('--as-account', dest='DelegateAccount', metavar='ACCOUNT',
-                  help='''[Eucalyptus only] run this command as the
-                          administrator of another account (only usable by
-                          cloud administrators)'''),
+                  help='''[Eucalyptus cloud admin only] run this command as
+                  the administrator of another account'''),
               Arg('--delegate', dest='deprecated_delegate', route_to=None,
                   help=argparse.SUPPRESS)]
diff --git a/euca2ools/commands/euare/createaccount.py b/euca2ools/commands/euare/createaccount.py
index 32da182..3620a53 100644
--- a/euca2ools/commands/euare/createaccount.py
+++ b/euca2ools/commands/euare/createaccount.py
@@ -34,8 +34,7 @@ from requestbuilder.mixins import TabifyingMixin
 
 
 class CreateAccount(EuareRequest, TabifyingMixin):
-    DESCRIPTION = ('[Eucalyptus only] Create a new account. This command is '
-                   'only usable by cloud administrators.')
+    DESCRIPTION = '[Eucalyptus cloud admin only] Create a new account'
     ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
                 required=True, help='name of the account to create (required)')]
 
diff --git a/euca2ools/commands/euare/deleteaccount.py b/euca2ools/commands/euare/deleteaccount.py
index 35c66d4..1b18323 100644
--- a/euca2ools/commands/euare/deleteaccount.py
+++ b/euca2ools/commands/euare/deleteaccount.py
@@ -33,8 +33,7 @@ from requestbuilder import Arg
 
 
 class DeleteAccount(EuareRequest):
-    DESCRIPTION = ('[Eucalyptus only] Delete an account. This command is only '
-                   'usable by cloud administrators.')
+    DESCRIPTION = '[Eucalyptus cloud admin only] Delete an account'
     ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
                 required=True, help='name of the account to delete (required)'),
             Arg('-r', '--recursive', dest='Recursive', action='store_const',
diff --git a/euca2ools/commands/euare/deleteaccountpolicy.py b/euca2ools/commands/euare/deleteaccountpolicy.py
index eb1c093..b8258a4 100644
--- a/euca2ools/commands/euare/deleteaccountpolicy.py
+++ b/euca2ools/commands/euare/deleteaccountpolicy.py
@@ -33,8 +33,8 @@ from requestbuilder import Arg
 
 
 class DeleteAccountPolicy(EuareRequest):
-    DESCRIPTION = ('[Eucalyptus only] Remove a policy from an account. This '
-                   'command is only usable by cloud administrators.')
+    DESCRIPTION = ('[Eucalyptus cloud admin only] Remove a policy from an '
+                   'account')
     ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
                 required=True,
                 help='account the policy is attached to (required)'),
diff --git a/euca2ools/commands/euare/getldapsyncstatus.py b/euca2ools/commands/euare/getldapsyncstatus.py
index 1455a9f..379e562 100644
--- a/euca2ools/commands/euare/getldapsyncstatus.py
+++ b/euca2ools/commands/euare/getldapsyncstatus.py
@@ -33,9 +33,8 @@ from requestbuilder.mixins import TabifyingMixin
 
 
 class GetLdapSyncStatus(EuareRequest, TabifyingMixin):
-    DESCRIPTION = ("[Eucalyptus only] Describe the server's current LDAP "
-                   "synchronization status. This command is only usable by "
-                   "cloud administrators.")
+    DESCRIPTION = ("[Eucalyptus cloud admin only] Show the status of the "
+                   "cloud's LDAP synchronization")
 
     def print_result(self, result):
         print self.tabify(('SyncEnabled', result.get('SyncEnabled')))
diff --git a/euca2ools/commands/euare/listaccounts.py b/euca2ools/commands/euare/listaccounts.py
index 33317ef..8e038eb 100644
--- a/euca2ools/commands/euare/listaccounts.py
+++ b/euca2ools/commands/euare/listaccounts.py
@@ -34,8 +34,8 @@ from requestbuilder.mixins import TabifyingMixin
 
 
 class ListAccounts(EuareRequest, TabifyingMixin):
-    DESCRIPTION = ("[Eucalyptus only] List all of the cloud's accounts. This "
-                   "command is only usable by cloud administrators.")
+    DESCRIPTION = ("[Eucalyptus cloud admin only] List all of the cloud's "
+                   "accounts")
     LIST_TAGS = ['Accounts']
 
     def print_result(self, result):
diff --git a/euca2ools/commands/euare/putaccountpolicy.py b/euca2ools/commands/euare/putaccountpolicy.py
index fb7f0d1..e0083be 100644
--- a/euca2ools/commands/euare/putaccountpolicy.py
+++ b/euca2ools/commands/euare/putaccountpolicy.py
@@ -33,8 +33,7 @@ from requestbuilder import Arg, MutuallyExclusiveArgList
 
 
 class PutAccountPolicy(EuareRequest):
-    DESCRIPTION = ('[Eucalyptus only] Attach a policy to an account. This '
-                   'command is only usable by cloud administrators.')
+    DESCRIPTION = '[Eucalyptus cloud admin only] Attach a policy to an account'
     ARGS = [Arg('-a', '--account-name', dest='AccountName', metavar='ACCOUNT',
                 required=True,
                 help='account to attach the policy to (required)'),

-- 
managing cloud instances for Eucalyptus