diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 deleted file mode 100644 index b53e5911e7..0000000000 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block ceilometer_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start -RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start - -{% block ceilometer_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 64e1c4b01b..f6318104db 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -16,6 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start +RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start + {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-notification/extend_start.sh similarity index 100% rename from docker/ceilometer/ceilometer-api/extend_start.sh rename to docker/ceilometer/ceilometer-notification/extend_start.sh diff --git a/releasenotes/notes/deprecate-ceilometer-api-71e5c7b01a3aad6c.yaml b/releasenotes/notes/deprecate-ceilometer-api-71e5c7b01a3aad6c.yaml new file mode 100644 index 0000000000..117159db58 --- /dev/null +++ b/releasenotes/notes/deprecate-ceilometer-api-71e5c7b01a3aad6c.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - Ceilometer API was deprecated in the Ceilometer project since Ocata + release.