diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-24 15:04:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-24 15:04:40 +0000 |
| commit | d29af132543634c00f9ea3ddccfb33009845225c (patch) | |
| tree | cb7c00b362a584f1ce393362c268c6ad054c0f76 | |
| parent | a46978ead4e205e4b37e311633202e97048faad3 (diff) | |
| parent | da6e196f241df709e4e0d11b4e951de6bf81f550 (diff) | |
| download | kolla-d29af132543634c00f9ea3ddccfb33009845225c.tar.gz kolla-d29af132543634c00f9ea3ddccfb33009845225c.zip | |
Merge "Adjust pip install for kolla-ansible"
| -rw-r--r-- | docker_templates/kolla-ansible/Dockerfile.j2 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker_templates/kolla-ansible/Dockerfile.j2 b/docker_templates/kolla-ansible/Dockerfile.j2 index f502ef630..78713988b 100644 --- a/docker_templates/kolla-ansible/Dockerfile.j2 +++ b/docker_templates/kolla-ansible/Dockerfile.j2 @@ -28,15 +28,7 @@ RUN pip install shade RUN git clone https://github.com/ansible/ansible.git \ && cd ansible \ && git submodule update --init --recursive \ - && pip 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 %} + && pip --install-option="--install-scripts=/usr/bin" install . RUN mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts |