deprecate s3 image service config options

The "S3ImageService" class needed config options to set the
expected behavior. This class is not referenced in the code anymore,
as we deprecated S3 in Kilo and removed (most of) the code in Mitaka
with commit 4140eb4 with a proper release note.

This change deprecates the s3 image module related config options.

Change-Id: I65e2973b6660e36c791e1c644cfca9da7519d716

nova/conf/s3.py

@@ -19,30 +19,45 @@
 
 s3_opts = [
     cfg.StrOpt('image_decryption_dir',
+               deprecated_for_removal=True,
+               deprecated_reason='EC2 API related options are not supported.',
                default='/tmp',
-               help='Parent directory for tempdir used for image decryption'),
+               help='DEPRECATED: Parent directory for tempdir used for image '
+                    'decryption'),
     cfg.StrOpt('s3_host',
+               deprecated_for_removal=True,
+               deprecated_reason='EC2 API related options are not supported.',
                default='$my_ip',
-               help='Hostname or IP for OpenStack to use when accessing '
-                    'the S3 api'),
+               help='DEPRECATED: Hostname or IP for OpenStack to use when '
+                    'accessing the S3 api'),
     cfg.IntOpt('s3_port',
+               deprecated_for_removal=True,
+               deprecated_reason='EC2 API related options are not supported.',
                default=3333,
                min=1,
                max=65535,
-               help='Port used when accessing the S3 api'),
+               help='DEPRECATED: Port used when accessing the S3 api'),
     cfg.StrOpt('s3_access_key',
+               deprecated_for_removal=True,
+               deprecated_reason='EC2 API related options are not supported.',
                default='notchecked',
-               help='Access key to use for S3 server for images'),
+               help='DEPRECATED: Access key to use for S3 server for images'),
     cfg.StrOpt('s3_secret_key',
+               deprecated_for_removal=True,
+               deprecated_reason='EC2 API related options are not supported.',
                default='notchecked',
-               help='Secret key to use for S3 server for images'),
+               help='DEPRECATED: Secret key to use for S3 server for images'),
     cfg.BoolOpt('s3_use_ssl',
+                deprecated_for_removal=True,
+                deprecated_reason='EC2 API related options are not supported.',
                 default=False,
-                help='Whether to use SSL when talking to S3'),
+                help='DEPRECATED: Whether to use SSL when talking to S3'),
     cfg.BoolOpt('s3_affix_tenant',
+                deprecated_for_removal=True,
+                deprecated_reason='EC2 API related options are not supported.',
                 default=False,
-                help='Whether to affix the tenant id to the access key '
-                     'when downloading from S3'),
+                help='DEPRECATED: Whether to affix the tenant id to the '
+                     'access key when downloading from S3'),
     ]
 
 

releasenotes/notes/deprecate-config-s3-image-adb7c86c9b9220a5.yaml

@@ -0,0 +1,9 @@
+---
+deprecations:
+  - As mentioned in the release notes of the Mitaka release (version 13.0.0),
+    the EC2API support was fully removed. The *s3* image service related
+    config options were still there but weren't used anywhere in the code
+    since Mitaka. These are now deprecated and may be removed as early as the
+    15.0.0 release. This affects ``image_decryption_dir``, ``s3_host``,
+    ``s3_port``, ``s3_access_key``, ``s3_secret_key``, ``s3_use_ssl``,
+    ``s3_affix_tenant``.