Merge "Remove environment defaults"

neutronclient/shell.py

@@ -602,12 +602,10 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-cloud', metavar='<cloud>',
-            default=env('OS_CLOUD', default=None),
             help=_('Defaults to env[OS_CLOUD].'))
 
         parser.add_argument(
             '--os-auth-url', metavar='<auth-url>',
-            default=env('OS_AUTH_URL'),
             help=_('Authentication URL, defaults to env[OS_AUTH_URL].'))
         parser.add_argument(
             '--os_auth_url',
@@ -616,13 +614,11 @@ class NeutronShell(app.App):
         project_name_group = parser.add_mutually_exclusive_group()
         project_name_group.add_argument(
             '--os-tenant-name', metavar='<auth-tenant-name>',
-            default=env('OS_TENANT_NAME'),
             help=_('Authentication tenant name, defaults to '
                    'env[OS_TENANT_NAME].'))
         project_name_group.add_argument(
             '--os-project-name',
             metavar='<auth-project-name>',
-            default=utils.env('OS_PROJECT_NAME'),
             help=_('Another way to specify tenant name. '
                    'This option is mutually exclusive with '
                    ' --os-tenant-name. '
@@ -635,13 +631,11 @@ class NeutronShell(app.App):
         project_id_group = parser.add_mutually_exclusive_group()
         project_id_group.add_argument(
             '--os-tenant-id', metavar='<auth-tenant-id>',
-            default=env('OS_TENANT_ID'),
             help=_('Authentication tenant ID, defaults to '
                    'env[OS_TENANT_ID].'))
         project_id_group.add_argument(
             '--os-project-id',
             metavar='<auth-project-id>',
-            default=utils.env('OS_PROJECT_ID'),
             help=_('Another way to specify tenant ID. '
                    'This option is mutually exclusive with '
                    ' --os-tenant-id. '
@@ -649,7 +643,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-username', metavar='<auth-username>',
-            default=utils.env('OS_USERNAME'),
             help=_('Authentication username, defaults to env[OS_USERNAME].'))
         parser.add_argument(
             '--os_username',
@@ -657,7 +650,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-user-id', metavar='<auth-user-id>',
-            default=env('OS_USER_ID'),
             help=_('Authentication user ID (Env: OS_USER_ID)'))
 
         parser.add_argument(
@@ -667,7 +659,6 @@ class NeutronShell(app.App):
         parser.add_argument(
             '--os-user-domain-id',
             metavar='<auth-user-domain-id>',
-            default=utils.env('OS_USER_DOMAIN_ID'),
             help=_('OpenStack user domain ID. '
                    'Defaults to env[OS_USER_DOMAIN_ID].'))
 
@@ -678,7 +669,6 @@ class NeutronShell(app.App):
         parser.add_argument(
             '--os-user-domain-name',
             metavar='<auth-user-domain-name>',
-            default=utils.env('OS_USER_DOMAIN_NAME'),
             help=_('OpenStack user domain name. '
                    'Defaults to env[OS_USER_DOMAIN_NAME].'))
 
@@ -697,19 +687,16 @@ class NeutronShell(app.App):
         parser.add_argument(
             '--os-project-domain-id',
             metavar='<auth-project-domain-id>',
-            default=utils.env('OS_PROJECT_DOMAIN_ID'),
             help=_('Defaults to env[OS_PROJECT_DOMAIN_ID].'))
 
         parser.add_argument(
             '--os-project-domain-name',
             metavar='<auth-project-domain-name>',
-            default=utils.env('OS_PROJECT_DOMAIN_NAME'),
             help=_('Defaults to env[OS_PROJECT_DOMAIN_NAME].'))
 
         parser.add_argument(
             '--os-cert',
             metavar='<certificate>',
-            default=utils.env('OS_CERT'),
             help=_("Path of certificate file to use in SSL "
                    "connection. This file can optionally be "
                    "prepended with the private key. Defaults "
@@ -718,7 +705,6 @@ class NeutronShell(app.App):
         parser.add_argument(
             '--os-cacert',
             metavar='<ca-certificate>',
-            default=env('OS_CACERT', default=None),
             help=_("Specify a CA bundle file to use in "
                    "verifying a TLS (https) server certificate. "
                    "Defaults to env[OS_CACERT]."))
@@ -726,7 +712,6 @@ class NeutronShell(app.App):
         parser.add_argument(
             '--os-key',
             metavar='<key>',
-            default=utils.env('OS_KEY'),
             help=_("Path of client key to use in SSL "
                    "connection. This option is not necessary "
                    "if your key is prepended to your certificate "
@@ -734,7 +719,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-password', metavar='<auth-password>',
-            default=utils.env('OS_PASSWORD'),
             help=_('Authentication password, defaults to env[OS_PASSWORD].'))
         parser.add_argument(
             '--os_password',
@@ -742,7 +726,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-region-name', metavar='<auth-region-name>',
-            default=env('OS_REGION_NAME'),
             help=_('Authentication region name, defaults to '
                    'env[OS_REGION_NAME].'))
         parser.add_argument(
@@ -751,7 +734,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-token', metavar='<token>',
-            default=env('OS_TOKEN'),
             help=_('Authentication token, defaults to env[OS_TOKEN].'))
         parser.add_argument(
             '--os_token',
@@ -765,7 +747,6 @@ class NeutronShell(app.App):
 
         parser.add_argument(
             '--os-url', metavar='<url>',
-            default=env('OS_URL'),
             help=_('Defaults to env[OS_URL].'))
         parser.add_argument(
             '--os_url',