diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-02 09:42:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-02 09:42:34 +0000 |
| commit | 934f41fb71a1b98f40def59715bcb5393def4f30 (patch) | |
| tree | beb04e446aa1e99df85c8e0d12c803294cb000ac | |
| parent | 86afa1417aa5a45de9d71b640719a03801c7b107 (diff) | |
| parent | 9ebd3bcfd55b9e172f71a6863dbc0f4aeb8c3ea6 (diff) | |
| download | kolla-934f41fb71a1b98f40def59715bcb5393def4f30.tar.gz kolla-934f41fb71a1b98f40def59715bcb5393def4f30.zip | |
Merge "Remove ceilometer-collector image"
| -rw-r--r-- | docker/ceilometer/ceilometer-collector/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml | 4 |
2 files changed, 4 insertions, 22 deletions
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 deleted file mode 100644 index 9a7f3dc2e..000000000 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block ceilometer_collector_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %} - {% elif base_distro in ['debian', 'ubuntu'] %} - {% set ceilometer_collector_packages = ['ceilometer-collector'] %} - {% endif %} - -{{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }} - -{% endif %} - -{% block ceilometer_collector_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER ceilometer diff --git a/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml b/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml new file mode 100644 index 000000000..278d1668d --- /dev/null +++ b/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - remove ceilometer-collector image, as it is removed from ceilometer code + base. |