Remove remaining implementation for Heat CloudWatch API

The CloudWatch API was removed during Queens cycle[1]. This change
removes the remaining parameters because these have been kept for
enough cycles to let users aware of the removal.

Change-Id: I4f57f02332cb1b61a0681794e519dd5ecfbec6c3

4 files changed, 4 insertions, 116 deletions

diff --git a/heat/common/config.py b/heat/common/config.py
index 72d1aaf09..b96da54aa 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -47,12 +47,6 @@ service_opts = [
                       'keystone catalog')),
     cfg.StrOpt('heat_waitcondition_server_url',
                help=_('URL of the Heat waitcondition server.')),
-    cfg.StrOpt('heat_watch_server_url',
-               default="",
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch Service has been removed.',
-               deprecated_since='10.0.0',
-               help=_('URL of the Heat CloudWatch server.')),
     cfg.StrOpt('instance_connection_is_secure',
                default="0",
                help=_('Instance connection to CFN/CW API via https.')),
@@ -218,12 +212,6 @@ engine_opts = [
                default=2,
                help=_('RPC timeout for the engine liveness check that is used'
                       ' for stack locking.')),
-    cfg.BoolOpt('enable_cloud_watch_lite',
-                default=False,
-                deprecated_for_removal=True,
-                deprecated_reason='Heat CloudWatch Service has been removed.',
-                deprecated_since='10.0.0',
-                help=_('Enable the legacy OS::Heat::CWLiteAlarm resource.')),
     cfg.BoolOpt('enable_stack_abandon',
                 default=False,
                 help=_('Enable the preview Stack Abandon feature.')),
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 7e63ee883..42126b7b4 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -130,68 +130,6 @@ cfg.CONF.register_group(api_cfn_group)
 cfg.CONF.register_opts(api_cfn_opts,
                        group=api_cfn_group)
 
-api_cw_opts = [
-    cfg.IPOpt('bind_host', default='0.0.0.0',
-              help=_('Address to bind the server. Useful when '
-                     'selecting a particular network interface.'),
-              deprecated_group='DEFAULT',
-              deprecated_for_removal=True,
-              deprecated_reason='Heat CloudWatch API has been removed.',
-              deprecated_since='10.0.0'),
-    cfg.PortOpt('bind_port', default=8003,
-                help=_('The port on which the server will listen.'),
-                deprecated_group='DEFAULT',
-                deprecated_for_removal=True,
-                deprecated_reason='Heat CloudWatch API has been removed.',
-                deprecated_since='10.0.0'),
-    cfg.IntOpt('backlog', default=4096,
-               help=_("Number of backlog requests "
-                      "to configure the socket with."),
-               deprecated_group='DEFAULT',
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been removed.',
-               deprecated_since='10.0.0'),
-    cfg.StrOpt('cert_file',
-               help=_("Location of the SSL certificate file "
-                      "to use for SSL mode."),
-               deprecated_group='DEFAULT',
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been Removed.',
-               deprecated_since='10.0.0'),
-    cfg.StrOpt('key_file',
-               help=_("Location of the SSL key file to use "
-                      "for enabling SSL mode."),
-               deprecated_group='DEFAULT',
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been Removed.',
-               deprecated_since='10.0.0'),
-    cfg.IntOpt('workers', min=0, default=1,
-               help=_("Number of workers for Heat service."),
-               deprecated_group='DEFAULT',
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been Removed.',
-               deprecated_since='10.0.0'),
-    cfg.IntOpt('max_header_line', default=16384,
-               help=_('Maximum line size of message headers to be accepted. '
-                      'max_header_line may need to be increased when using '
-                      'large tokens (typically those generated by the '
-                      'Keystone v3 API with big service catalogs.)'),
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been Removed.',
-               deprecated_since='10.0.0'),
-    cfg.IntOpt('tcp_keepidle', default=600,
-               help=_('The value for the socket option TCP_KEEPIDLE.  This is '
-                      'the time in seconds that the connection must be idle '
-                      'before TCP starts sending keepalive probes.'),
-               deprecated_for_removal=True,
-               deprecated_reason='Heat CloudWatch API has been Removed.',
-               deprecated_since='10.0.0')
-]
-api_cw_group = cfg.OptGroup('heat_api_cloudwatch')
-cfg.CONF.register_group(api_cw_group)
-cfg.CONF.register_opts(api_cw_opts,
-                       group=api_cw_group)
-
 wsgi_elt_opts = [
     cfg.BoolOpt('wsgi_keep_alive',
                 default=True,
@@ -218,7 +156,6 @@ def list_opts():
     yield None, [json_size_opt]
     yield 'heat_api', api_opts
     yield 'heat_api_cfn', api_cfn_opts
-    yield 'heat_api_cloudwatch', api_cw_opts
     yield 'eventlet_opts', wsgi_elt_opts
 
 
diff --git a/heat/engine/resources/openstack/heat/cloud_watch.py b/heat/engine/resources/openstack/heat/cloud_watch.py
deleted file mode 100644
index 26ed62f13..000000000
--- a/heat/engine/resources/openstack/heat/cloud_watch.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_config import cfg
-
-from heat.common.i18n import _
-from heat.engine.resources.openstack.heat import none_resource
-from heat.engine import support
-
-
-class CloudWatchAlarm(none_resource.NoneResource):
-    support_status = support.SupportStatus(
-        status=support.HIDDEN,
-        message=_('OS::Heat::CWLiteAlarm resource has been removed '
-                  'since version 10.0.0. Existing stacks can still '
-                  'use it, where it would do nothing for update/delete.'),
-        version='5.0.0',
-        previous_status=support.SupportStatus(
-            status=support.DEPRECATED,
-            version='2014.2')
-    )
-
-
-def resource_mapping():
-    cfg.CONF.import_opt('enable_cloud_watch_lite', 'heat.common.config')
-    if cfg.CONF.enable_cloud_watch_lite:
-        return {
-            'OS::Heat::CWLiteAlarm': CloudWatchAlarm,
-        }
-    else:
-        return {}
diff --git a/releasenotes/notes/cloud-watch-cleanup-62151466d15ac504.yaml b/releasenotes/notes/cloud-watch-cleanup-62151466d15ac504.yaml
new file mode 100644
index 000000000..39d78b625
--- /dev/null
+++ b/releasenotes/notes/cloud-watch-cleanup-62151466d15ac504.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The remaining deprecated parameters for Cloud Watch API have been removed.