From c9557cb349d83c88d488327182b15475de7c6d8f Mon Sep 17 00:00:00 2001 From: rabi Date: Mon, 5 Feb 2018 10:28:53 +0530 Subject: [PATCH] Remove heat-api-cloudwatch image In 6d55417f80384ead56e176beec9e2fc4eb162d61 cloudwatch api has been removed from heat. Change-Id: I70cb2aec7f262ab3a4afc383b502c6fed68ce01c Related-Bug: #1747294 --- docker/heat/heat-api-cloudwatch/Dockerfile.j2 | 20 ------------------- ...-heat-cloudwatch-api-c71e9deafffdb3e7.yaml | 4 ++++ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 docker/heat/heat-api-cloudwatch/Dockerfile.j2 create mode 100644 releasenotes/notes/remove-heat-cloudwatch-api-c71e9deafffdb3e7.yaml diff --git a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 b/docker/heat/heat-api-cloudwatch/Dockerfile.j2 deleted file mode 100644 index 1eb18223fa..0000000000 --- a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 +++ /dev/null @@ -1,20 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block heat_api_cloudwatch_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set heat_api_cloudwatch_packages = ['openstack-heat-api-cloudwatch'] %} - {% elif base_distro in ['ubuntu'] %} - {% set heat_api_cloudwatch_packages = ['heat-api-cloudwatch'] %} - {% endif %} -{{ macros.install_packages(heat_api_cloudwatch_packages | customizable("packages")) }} -{% endif %} - -{% block heat_api_cloudwatch_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER heat diff --git a/releasenotes/notes/remove-heat-cloudwatch-api-c71e9deafffdb3e7.yaml b/releasenotes/notes/remove-heat-cloudwatch-api-c71e9deafffdb3e7.yaml new file mode 100644 index 0000000000..3498036291 --- /dev/null +++ b/releasenotes/notes/remove-heat-cloudwatch-api-c71e9deafffdb3e7.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - remove heat-api-cloudwatch image, as it is removed from heat code + base.