diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-29 15:49:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-29 15:49:24 +0000 |
| commit | 180d012ca728112e518e53230612fe22a722e4b9 (patch) | |
| tree | 9e85e906c8c7469e7b23503d72f2a013cea2b8e6 | |
| parent | 67edb39b4c475a176bed80a3314456323da6cb6d (diff) | |
| parent | 4b9973b779e666ec0b8efc3ee1654831dc63e05b (diff) | |
| download | python-openstackclient-180d012ca728112e518e53230612fe22a722e4b9.tar.gz | |
Merge "Update help text for encryption provider"
| -rw-r--r-- | doc/source/cli/command-objects/volume-type.rst | 8 | ||||
| -rw-r--r-- | openstackclient/volume/v1/volume_type.py | 8 | ||||
| -rw-r--r-- | 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 afa293d7..2b5aff99 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 <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 <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 f9baa5be..b4d8eaca 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='<provider>', - 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='<provider>', - 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 64c4d652..71e94a2b 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='<provider>', - 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='<provider>', - 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", ' |