Merge "Remove support for heat-api-cloudwatch service"

manifests/haproxy.pp

@@ -256,10 +256,6 @@
 #  (optional) Enable or not Heat API binding
 #  Defaults to hiera('heat_api_enabled', false)
 #
-# [*heat_cloudwatch*]
-#  (optional) Enable or not Heat Cloudwatch API binding
-#  Defaults to hiera('heat_api_cloudwatch_enabled', false)
-#
 # [*heat_cfn*]
 #  (optional) Enable or not Heat CFN API binding
 #  Defaults to hiera('heat_api_cfn_enabled', false)
@@ -398,10 +394,6 @@
 #  (optional) Specify the network heat_cfn is running on.
 #  Defaults to hiera('heat_api_cfn_network', undef)
 #
-# [*heat_cloudwatch_network*]
-#  (optional) Specify the network heat_cloudwatch is running on.
-#  Defaults to hiera('heat_api_cloudwatch_network', undef)
-#
 # [*horizon_network*]
 #  (optional) Specify the network horizon is running on.
 #  Defaults to hiera('horizon_network', undef)
@@ -623,7 +615,6 @@ class tripleo::haproxy (
   $mistral                     = hiera('mistral_api_enabled', false),
   $swift_proxy_server          = hiera('swift_proxy_enabled', false),
   $heat_api                    = hiera('heat_api_enabled', false),
-  $heat_cloudwatch             = hiera('heat_api_cloudwatch_enabled', false),
   $heat_cfn                    = hiera('heat_api_cfn_enabled', false),
   $horizon                     = hiera('horizon_enabled', false),
   $ironic                      = hiera('ironic_api_enabled', false),
@@ -657,7 +648,6 @@ class tripleo::haproxy (
   $gnocchi_network             = hiera('gnocchi_api_network', undef),
   $heat_api_network            = hiera('heat_api_network', undef),
   $heat_cfn_network            = hiera('heat_api_cfn_network', undef),
-  $heat_cloudwatch_network     = hiera('heat_api_cloudwatch_network', undef),
   $horizon_network             = hiera('horizon_network', undef),
   $ironic_inspector_network    = hiera('ironic_inspector_network', undef),
   $ironic_network              = hiera('ironic_api_network', undef),
@@ -1215,21 +1205,6 @@ class tripleo::haproxy (
     }
   }
 
-  if $heat_cloudwatch {
-    ::tripleo::haproxy::endpoint { 'heat_cloudwatch':
-      public_virtual_ip => $public_virtual_ip,
-      internal_ip       => $heat_api_vip,
-      service_port      => $ports[heat_cw_port],
-      ip_addresses      => $heat_ip_addresses,
-      server_names      => hiera('heat_api_node_names', $controller_hosts_names_real),
-      mode              => 'http',
-      listen_options    => $heat_options,
-      public_ssl_port   => $ports[heat_cw_ssl_port],
-      service_network   => $heat_cloudwatch_network,
-      member_options    => union($haproxy_member_options, $internal_tls_member_options),
-    }
-  }
-
   if $heat_cfn {
     ::tripleo::haproxy::endpoint { 'heat_cfn':
       public_virtual_ip => $public_virtual_ip,

manifests/profile/base/heat/api_cloudwatch.pp

@@ -1,87 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# 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.
-#
-# == Class: tripleo::profile::base::heat::api_cloudwatch
-#
-# Heat CloudWatch API profile for tripleo
-#
-# === Parameters
-#
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
-# [*certificates_specs*]
-#   (Optional) The specifications to give to certmonger for the certificate(s)
-#   it will create.
-#   Example with hiera:
-#     apache_certificates_specs:
-#       httpd-internal_api:
-#         hostname: <overcloud controller fqdn>
-#         service_certificate: <service certificate path>
-#         service_key: <service key path>
-#         principal: "haproxy/<overcloud controller fqdn>"
-#   Defaults to hiera('apache_certificate_specs', {}).
-#
-# [*enable_internal_tls*]
-#   (Optional) Whether TLS in the internal network is enabled or not.
-#   Defaults to hiera('enable_internal_tls', false)
-#
-# [*heat_api_cloudwatch_network*]
-#   (Optional) The network name where the heat cloudwatch endpoint is listening
-#   on. This is set by t-h-t.
-#   Defaults to hiera('heat_api_cloudwatch_network', undef)
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::heat::api_cloudwatch (
-  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
-  $certificates_specs            = hiera('apache_certificates_specs', {}),
-  $enable_internal_tls           = hiera('enable_internal_tls', false),
-  $heat_api_cloudwatch_network   = hiera('heat_api_cloudwatch_network', undef),
-  $step                          = Integer(hiera('step')),
-) {
-  if $::hostname == downcase($bootstrap_node) {
-    $is_bootstrap = true
-  } else {
-    $is_bootstrap = false
-  }
-
-  include ::tripleo::profile::base::heat
-
-  if $enable_internal_tls {
-    if !$heat_api_cloudwatch_network {
-      fail('heat_api_cloudwatch_network is not set in the hieradata.')
-    }
-    $tls_certfile = $certificates_specs["httpd-${heat_api_cloudwatch_network}"]['service_certificate']
-    $tls_keyfile = $certificates_specs["httpd-${heat_api_cloudwatch_network}"]['service_key']
-  } else {
-    $tls_certfile = undef
-    $tls_keyfile = undef
-  }
-
-  if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
-    include ::heat::api_cloudwatch
-
-    include ::tripleo::profile::base::apache
-    class { '::heat::wsgi::apache_api_cloudwatch':
-      ssl_cert => $tls_certfile,
-      ssl_key  => $tls_keyfile,
-    }
-  }
-}
-

releasenotes/notes/remove-heat-api-cloudwatch-bb2b8d0cdff775e2.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Remove support for heat-api-cloudwatch service. It's been
+    removed from heat since Queens release.