3 files changed, 15 insertions, 6 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py
index 95be8132..d6bc9fd7 100644
--- a/openstackclient/object/v1/account.py
+++ b/openstackclient/object/v1/account.py
@@ -16,7 +16,6 @@
 from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
-import six
 
 from openstackclient.i18n import _
 
@@ -50,7 +49,7 @@ class ShowAccount(command.ShowOne):
         if 'properties' in data:
             data['properties'] = format_columns.DictColumn(
                 data.pop('properties'))
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
 
 
 class UnsetAccount(command.Command):
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index 02e8d277..917e41c0 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -21,7 +21,6 @@ from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -35,6 +34,16 @@ class CreateContainer(command.Lister):
     def get_parser(self, prog_name):
         parser = super(CreateContainer, self).get_parser(prog_name)
         parser.add_argument(
+            '--public',
+            action='store_true',
+            default=False,
+            help="Make the container publicly accessible"
+        )
+        parser.add_argument(
+            '--storage-policy',
+            help="Specify a particular storage policy to use."
+        )
+        parser.add_argument(
             'containers',
             metavar='<container-name>',
             nargs="+",
@@ -52,6 +61,8 @@ class CreateContainer(command.Lister):
                       ' is 256'), len(container))
             data = self.app.client_manager.object_store.container_create(
                 container=container,
+                public=parsed_args.public,
+                storage_policy=parsed_args.storage_policy
             )
             results.append(data)
 
@@ -233,7 +244,7 @@ class ShowContainer(command.ShowOne):
         if 'properties' in data:
             data['properties'] = format_columns.DictColumn(data['properties'])
 
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
 
 
 class UnsetContainer(command.Command):
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 3747e19e..01e537ee 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -22,7 +22,6 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -287,7 +286,7 @@ class ShowObject(command.ShowOne):
         if 'properties' in data:
             data['properties'] = format_columns.DictColumn(data['properties'])
 
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))
 
 
 class UnsetObject(command.Command):