a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
84 lines
3.0 KiB
Django/Jinja
84 lines
3.0 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
|
|
{% set keystone_packages = [
|
|
'openstack-keystone',
|
|
'python-keystoneclient',
|
|
'httpd',
|
|
'mod_wsgi',
|
|
'python-ldappool'
|
|
] %}
|
|
|
|
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/keystone \
|
|
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main \
|
|
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
|
|
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
|
|
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
|
|
{% set keystone_packages = [
|
|
'keystone',
|
|
'apache2',
|
|
'libapache2-mod-wsgi',
|
|
'python-ldappool'
|
|
] %}
|
|
|
|
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/keystone \
|
|
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
|
|
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \
|
|
&& echo > /etc/apache2/ports.conf
|
|
|
|
{% endif %}
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set keystone_packages = [
|
|
'httpd',
|
|
'mod_wsgi',
|
|
'python-ldappool'
|
|
] %}
|
|
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
|
|
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set keystone_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi',
|
|
'python-ldappool'
|
|
] %}
|
|
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
|
|
{% endif %}
|
|
ADD keystone-archive /keystone-source
|
|
RUN ln -s keystone-source/* keystone \
|
|
&& useradd --user-group keystone \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /keystone \
|
|
&& mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \
|
|
&& cp -r /keystone/etc/* /etc/keystone/ \
|
|
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
|
|
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
|
|
&& chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone
|
|
|
|
{% endif %}
|
|
|
|
RUN usermod -a -G kolla keystone \
|
|
&& chown -R keystone: /var/www/cgi-bin/keystone \
|
|
&& chmod 755 /var/www/cgi-bin/keystone/*
|
|
|
|
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
|
|
|
|
{% block keystone_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
{{ include_footer }}
|