3c45625197
This patch set fixes all Magnum issues in kolla master. The [trust] section set to magnum.conf using created trustee domain and user for Magnum in ansible/roles/magnum/tasks/register.yml using ansible openstack modules. Bump shade to 1.5.0 in kolla-toolbox because of os_user_role ansible module dependency. Certificate storage is changed from 'local' (non-production) to magnum's internal storage (x509keypair) or barbican. Co-Authored-By: Martin Matyas <martinx.maty@intel.com> Change-Id: Ifcb016c0bc4c8c3fc20e063fa05dc8838aae838c Closes-Bug: #1551992
35 lines
1.3 KiB
Django/Jinja
35 lines
1.3 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% block magnum_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
|
|
{% set magnum_base_packages = ['openstack-magnum-common'] %}
|
|
|
|
RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
{% set magnum_base_packages = ['magnum-common'] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD magnum-base-archive /magnum-base-source
|
|
RUN ln -s magnum-base-source/* magnum \
|
|
&& useradd --user-group magnum \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /magnum \
|
|
&& mkdir -p /etc/magnum /home/magnum /var/lib/magnum \
|
|
&& cp -r /magnum/etc/magnum/* /etc/magnum \
|
|
&& chown -R magnum: /etc/magnum /home/magnum /var/lib/magnum
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN usermod -a -G kolla magnum \
|
|
&& touch /usr/local/bin/kolla_magnum_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_magnum_extend_start
|