openstack/kolla-ansible
Code Issues Proposed changes

Adjust pip install for kolla-ansible

Browse Source 
Installing Ansible with pip as seen in this patch ensures both RPM and
DEB based systems install the binaries in the same path. This changes
nothing for RPM, but allows DEB to continue using the existing scripts
without having symlinks everywhere.

Change-Id: I0d530b1ed0a0e8b44413012f79251ab888153b23
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-22 11:26:01 +00:00
parent f70e8d4598
commit da6e196f24
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