openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Jeffrey Zhang 2017-11-14 13:01:21 +08:00 committed by Jeffrey Zhang
parent 65cd46e8e6
commit f17c796c52
1 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
docker/ceilometer/ceilometer-api/Dockerfile.j2
View File

@ -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