diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-11-14 13:01:21 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2017-11-14 15:28:43 +0000 |
| commit | f17c796c520ca2aad693b0942b214f873d193068 (patch) | |
| tree | df029256576b8466168e877fdb5ec97f19b6773c | |
| parent | 65cd46e8e6f80aa373680892f6b7e6ec4f55f788 (diff) | |
| download | kolla-f17c796c520ca2aad693b0942b214f873d193068.tar.gz kolla-f17c796c520ca2aad693b0942b214f873d193068.zip | |
Remove the installed packages in ceilometer-api container
ceilometer-api process is removed already. Kolla use ceilometer-api
container to bootstrap service. Since all the required packages is
installed in ceilometer-base, just remove all the packages in it.
Change-Id: Iddae52d22e54aef5fdd31d77829d7008ee0bc69b
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 04fe138b6..b53e5911e 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -3,67 +3,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block ceilometer_api_header %}{% endblock %} -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set ceilometer_api_packages = [ - 'httpd', - 'mod_ssl', - 'mod_wsgi', - 'openstack-ceilometer-api' - ] %} -{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['debian', 'ubuntu'] %} - {% set ceilometer_api_packages = [ - 'apache2', - 'ceilometer-api', - 'libapache2-mod-wsgi' - ] %} -{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf \ - && rm -f /etc/apache2/sites-available/ceilometer-api.conf \ - && a2dissite ceilometer-api - {% endif %} - - -{% elif install_type == 'source' %} - - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - - {% set ceilometer_api_packages = [ - 'gettext', - 'httpd', - 'mod_ssl', - 'mod_wsgi' - ] %} - -{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} - -{% block ceilometer_api_redhat_source_setup %} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf -{% endblock %} - - {% elif base_distro in ['debian', 'ubuntu'] %} - - {% set ceilometer_api_packages = [ - 'apache2', - 'gettext', - 'libapache2-mod-wsgi' - ] %} - -{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} - -{% block ceilometer_api_ubuntu_source_setup %} -RUN echo > /etc/apache2/ports.conf -{% endblock %} - {% endif %} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start |