diff --git a/magnumclient/tests/v1/test_baymodels_shell.py b/magnumclient/tests/v1/test_baymodels_shell.py
index 420e94e..89cd19e 100644
--- a/magnumclient/tests/v1/test_baymodels_shell.py
+++ b/magnumclient/tests/v1/test_baymodels_shell.py
@@ -33,7 +33,7 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
                                '--network-driver test_driver '
                                '--labels key=val '
                                '--master-flavor-id test_flavor '
-                               '--docker-volume-size 10'
+                               '--docker-volume-size 10 '
                                '--public')
         self.assertTrue(mock_create.called)
 
diff --git a/magnumclient/v1/baymodels_shell.py b/magnumclient/v1/baymodels_shell.py
index 9617be1..977f0f3 100644
--- a/magnumclient/v1/baymodels_shell.py
+++ b/magnumclient/v1/baymodels_shell.py
@@ -69,6 +69,7 @@ def _show_baymodel(baymodel):
            'of the bay.')
 @utils.arg('--docker-volume-size',
            metavar='<docker-volume-size>',
+           type=int,
            help='Specify the number of size in GB '
                 'for the docker volume to use.')
 @utils.arg('--http-proxy',
diff --git a/magnumclient/v1/bays_shell.py b/magnumclient/v1/bays_shell.py
index 1df49ba..7931f92 100644
--- a/magnumclient/v1/bays_shell.py
+++ b/magnumclient/v1/bays_shell.py
@@ -51,6 +51,8 @@ def do_bay_list(cs, args):
            help='Specifies custom discovery url for node discovery.')
 @utils.arg('--timeout',
            metavar='<timeout>',
+           type=int,
+           default=0,
            help='The timeout for bay creation in minutes. Set '
                 'to 0 for no timeout. The default is no timeout.')
 def do_bay_create(cs, args):