openstack/kolla
Code Issues Proposed changes

Merge "Adjust pip install for kolla-ansible"

Browse Source
This commit is contained in:
Jenkins 2015-08-24 15:04:40 +00:00 committed by Gerrit Code Review
commit d29af13254
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker_templates/kolla-ansible/Dockerfile.j2
View File

@ -28,15 +28,7 @@ RUN pip install shade
RUN git clone https://github.com/ansible/ansible.git \ RUN git clone https://github.com/ansible/ansible.git \
&& cd ansible \ && cd ansible \
&& git submodule update --init --recursive \ && git submodule update --init --recursive \
&& pip install . && pip --install-option="--install-scripts=/usr/bin" install .
{% if base_distro in ['ubuntu', 'debian'] %}
# TODO(SamYaple): Ubuntu installs pip packages to /usr/local/bin/ rather than
# /usr/bin This can be removed once the bin paths are generic
RUN ln -s /usr/local/bin/ansible /usr/bin/ansible
{% endif %}
RUN mkdir -p /etc/ansible /usr/share/ansible \ RUN mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local' > /etc/ansible/hosts && echo 'localhost ansible_connection=local' > /etc/ansible/hosts