From 4b9973b779e666ec0b8efc3ee1654831dc63e05b Mon Sep 17 00:00:00 2001 From: Brianna Poulos Date: Fri, 16 Feb 2018 16:19:06 -0500 Subject: [PATCH] Update help text for encryption provider The volume encryption provider no longer uses class names. Instead, 'luks' and 'plain' are used. This patch updates the help text for the volume encryption provider to use the new encryption provider format constants. Change-Id: I2911098505a99658e04ac4008e5f3e857db81f95 --- doc/source/cli/command-objects/volume-type.rst | 8 ++++---- openstackclient/volume/v1/volume_type.py | 8 ++++---- openstackclient/volume/v2/volume_type.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/source/cli/command-objects/volume-type.rst b/doc/source/cli/command-objects/volume-type.rst index afa293d7b..2b5aff994 100644 --- a/doc/source/cli/command-objects/volume-type.rst +++ b/doc/source/cli/command-objects/volume-type.rst @@ -62,8 +62,8 @@ Create new volume type .. option:: --encryption-provider - Set the class that provides encryption support for this volume type - (e.g "LuksEncryptor") (admin only) + Set the encryption provider format for this volume type + (e.g "luks" or "plain") (admin only) This option is required when setting encryption type of a volume. Consider using other encryption options such as: :option:`--encryption-cipher`, @@ -197,8 +197,8 @@ Set volume type properties .. option:: --encryption-provider - Set the class that provides encryption support for this volume type - (e.g "LuksEncryptor") (admin only) + Set the encryption provider format for this volume type + (e.g "luks" or "plain") (admin only) This option is required when setting encryption type of a volume for the first time. Consider using other encryption options such as: :option:`--encryption-cipher`, diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py index f9baa5be5..b4d8eaca2 100644 --- a/openstackclient/volume/v1/volume_type.py +++ b/openstackclient/volume/v1/volume_type.py @@ -70,8 +70,8 @@ class CreateVolumeType(command.ShowOne): parser.add_argument( '--encryption-provider', metavar='', - help=_('Set the class that provides encryption support for ' - 'this volume type (e.g "LuksEncryptor") (admin only) ' + help=_('Set the encryption provider format for ' + 'this volume type (e.g "luks" or "plain") (admin only) ' '(This option is required when setting encryption type ' 'of a volume. Consider using other encryption options ' 'such as: "--encryption-cipher", "--encryption-key-size" ' @@ -254,8 +254,8 @@ class SetVolumeType(command.Command): parser.add_argument( '--encryption-provider', metavar='', - help=_('Set the class that provides encryption support for ' - 'this volume type (e.g "LuksEncryptor") (admin only) ' + help=_('Set the encryption provider format for ' + 'this volume type (e.g "luks" or "plain") (admin only) ' '(This option is required when setting encryption type ' 'of a volume. Consider using other encryption options ' 'such as: "--encryption-cipher", "--encryption-key-size" ' diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py index 64c4d652b..71e94a2b4 100644 --- a/openstackclient/volume/v2/volume_type.py +++ b/openstackclient/volume/v2/volume_type.py @@ -112,8 +112,8 @@ class CreateVolumeType(command.ShowOne): parser.add_argument( '--encryption-provider', metavar='', - help=_('Set the class that provides encryption support for ' - 'this volume type (e.g "LuksEncryptor") (admin only) ' + help=_('Set the encryption provider format for ' + 'this volume type (e.g "luks" or "plain") (admin only) ' '(This option is required when setting encryption type ' 'of a volume. Consider using other encryption options ' 'such as: "--encryption-cipher", "--encryption-key-size" ' @@ -371,8 +371,8 @@ class SetVolumeType(command.Command): parser.add_argument( '--encryption-provider', metavar='', - help=_('Set the class that provides encryption support for ' - 'this volume type (e.g "LuksEncryptor") (admin only) ' + help=_('Set the encryption provider format for ' + 'this volume type (e.g "luks" or "plain") (admin only) ' '(This option is required when setting encryption type ' 'of a volume for the first time. Consider using other ' 'encryption options such as: "--encryption-cipher", '