openstack/kolla
Code Issues Proposed changes

Merge "install ansible from pypi in bifrost"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 08:24:52 +00:00 committed by Gerrit Code Review
commit f5dd71e90f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,9 @@ MAINTAINER {{ maintainer }}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ENV ANSIBLE_FROM_PYPI True
ADD bifrost-base-archive /bifrost-base-source ADD bifrost-base-archive /bifrost-base-source
COPY build_arg.yml /tmp/build_arg.yml COPY build_arg.yml /tmp/build_arg.yml
RUN ln -s bifrost-base-source/* bifrost \ RUN ln -s bifrost-base-source/* bifrost \
@ -21,7 +24,7 @@ RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mari
{% endif %} {% endif %}
RUN bash -c './scripts/env-setup.sh && source ./env-vars && source /opt/stack/ansible/hacking/env-setup && \ RUN bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/localhost /bifrost/playbooks/install.yaml \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/localhost /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \ -e @/tmp/build_arg.yml && \
{% if base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['ubuntu', 'debian'] %}