Merge "Update help text for encryption provider"

Author: Zuul

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`,

openstackclient/volume/v1/volume_type.py

@@ -70,8 +70,8 @@ def get_parser(self, prog_name):
         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 @@ def get_parser(self, prog_name):
         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" '

openstackclient/volume/v2/volume_type.py

@@ -112,8 +112,8 @@ def get_parser(self, prog_name):
         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 @@ def get_parser(self, prog_name):
         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", '