diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-01-16 22:15:16 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2017-01-17 01:07:10 +0000 |
| commit | ccd788de6e2c52eb929e8d62b72966c5fb3e52c8 (patch) | |
| tree | 45158ca612a1a25057fbd80cc1a61f95f588b87c /docker/bifrost | |
| parent | 25912e4a8b7e55da9c1cd045fe020a6dc09e8c7f (diff) | |
| download | kolla-ccd788de6e2c52eb929e8d62b72966c5fb3e52c8.tar.gz kolla-ccd788de6e2c52eb929e8d62b72966c5fb3e52c8.zip | |
install ansible from pypi in bifrost
There are some bug in installing Ansible from source in bifrost, and
install fro pypi is more stable.
Change-Id: Ib51979fabbf57627179e657e35a3bbbdb13b552b
Diffstat (limited to 'docker/bifrost')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 2a79b0baa..4d46ff784 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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'] %} |