diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-22 11:26:01 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-22 11:26:01 +0000 |
| commit | da6e196f241df709e4e0d11b4e951de6bf81f550 (patch) | |
| tree | a3b86a4da7f91ed7b8310762ca437b5b9e225b09 | |
| parent | f70e8d4598c58f8b2904542f7e0d87c693f70761 (diff) | |
| download | kolla-da6e196f241df709e4e0d11b4e951de6bf81f550.tar.gz kolla-da6e196f241df709e4e0d11b4e951de6bf81f550.zip | |
Adjust pip install for kolla-ansible
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
| -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 |