openstack/kolla
Code Issues Proposed changes

Update bifrost-base Dockerfile.j2 template.

Browse Source 
To facilitate build custimisations in template-overrides.j2
for bifrost-base, added a block section wrapping the execution
of the ansible install.yaml playbook.

Change-Id: I4eb18d03b7d7b2a2f65ec3c844af9149f9426949
This commit is contained in:
James McCarthy 2017-03-06 10:25:24 +00:00
parent 4ff3e30f0b
commit 0439e5fa3d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -30,6 +30,7 @@ WORKDIR /bifrost
RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql* RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql*
{% endif %} {% endif %}
{% block bifrost_ansible_install %}
RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ RUN bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \ -e @/tmp/build_arg.yml && \
@ -38,6 +39,7 @@ RUN bash -c './scripts/env-setup.sh && source ./env-vars && \
{% else %} {% else %}
yum clean all' yum clean all'
{% endif %} {% endif %}
{% endblock %}
{% endif %} {% endif %}
COPY bifrost_sudoers /etc/sudoers.d/kolla_bifrost_sudoers COPY bifrost_sudoers /etc/sudoers.d/kolla_bifrost_sudoers