diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-13 08:30:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-13 08:30:19 +0000 |
| commit | 6bbd334f0873f4d3a19ce1d19453bd858a7a72ce (patch) | |
| tree | b22e0fcaacf0b89495bec4df6dd2116a933504eb | |
| parent | 3c7b0ea7b48f425451a90f1486cd07a7979bc204 (diff) | |
| parent | c9557cb349d83c88d488327182b15475de7c6d8f (diff) | |
| download | kolla-6bbd334f0873f4d3a19ce1d19453bd858a7a72ce.tar.gz kolla-6bbd334f0873f4d3a19ce1d19453bd858a7a72ce.zip | |
Merge "Remove heat-api-cloudwatch image"
| -rw-r--r-- | docker/heat/heat-api-cloudwatch/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | releasenotes/notes/remove-heat-cloudwatch-api-c71e9deafffdb3e7.yaml | 4 |
2 files changed, 4 insertions, 20 deletions
diff --git a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 b/docker/heat/heat-api-cloudwatch/Dockerfile.j2 deleted file mode 100644 index 1eb18223f..000000000 --- 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 000000000..349803629 --- /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. |