diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 08:24:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 08:24:52 +0000 |
| commit | f5dd71e90f95b7ef3f024f13a0f2ff8358df6a2d (patch) | |
| tree | 5ccb7e866b36b46988291e483368ce4fbc47cac7 /docker | |
| parent | a3078d50e19aa64bb15ce2f0e39e9bb6ef5fb95d (diff) | |
| parent | ccd788de6e2c52eb929e8d62b72966c5fb3e52c8 (diff) | |
| download | kolla-f5dd71e90f95b7ef3f024f13a0f2ff8358df6a2d.tar.gz kolla-f5dd71e90f95b7ef3f024f13a0f2ff8358df6a2d.zip | |
Merge "install ansible from pypi in bifrost"
Diffstat (limited to 'docker')
| -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'] %} |