openstack/kolla
Code Issues Proposed changes

install ansible from pypi in bifrost

Browse Source 
There are some bug in installing Ansible from source in bifrost, and
install fro pypi is more stable.

Change-Id: Ib51979fabbf57627179e657e35a3bbbdb13b552b
This commit is contained in:
Jeffrey Zhang 2017-01-16 22:15:16 +08:00 committed by Jeffrey Zhang
parent 25912e4a8b
commit ccd788de6e
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
{% elif install_type == 'source' %}
ENV ANSIBLE_FROM_PYPI True
ADD bifrost-base-archive /bifrost-base-source
COPY build_arg.yml /tmp/build_arg.yml
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 %}
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 \
-e @/tmp/build_arg.yml && \
{% if base_distro in ['ubuntu', 'debian'] %}