diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-09 11:19:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-09 11:19:29 +0000 |
| commit | 9fbf4ef4858806e25fd386d4b12d9215f552c1b6 (patch) | |
| tree | 192618cceeb485f2d60b62c7e6a1c21ca7949a01 /docker | |
| parent | cc2fe74aef8778bcc5874860a3b4608782aba15c (diff) | |
| parent | 4d1fa3cb90eae56b9314d71c4ccfa1428f61d1fd (diff) | |
| download | kolla-9fbf4ef4858806e25fd386d4b12d9215f552c1b6.tar.gz kolla-9fbf4ef4858806e25fd386d4b12d9215f552c1b6.zip | |
Merge "Bump the ansible version to >2 in the kolla-toolbox"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 061dab08f..1675117c6 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -42,17 +42,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && rm get-pip.py \ && pip --no-cache-dir install pytz \ && pip --no-cache-dir install \ + 'ansible>2' \ MySQL-python \ os-client-config==1.16.0 \ pyudev \ shade==1.4.0 -RUN git clone https://github.com/ansible/ansible.git \ - && cd ansible \ - && git checkout 89569d035ea5002302a0a6b03451a4963fd83eb3 \ - && git submodule update --init --recursive \ - && pip --no-cache-dir install . - RUN useradd --user-group ansible --groups kolla \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ |