diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-01 23:04:39 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-07 14:58:53 +0800 |
| commit | 4d1fa3cb90eae56b9314d71c4ccfa1428f61d1fd (patch) | |
| tree | c1be3eb2efc758f3b716b63a9edc230343e9df83 /docker | |
| parent | 3545e6d503c7451921333134fb75d3fef3713952 (diff) | |
| download | kolla-4d1fa3cb90eae56b9314d71c4ccfa1428f61d1fd.tar.gz kolla-4d1fa3cb90eae56b9314d71c4ccfa1428f61d1fd.zip | |
Bump the ansible version to >2 in the kolla-toolbox
Kolla do not depend on certain version of Ansible. So
install the ansible using pip
Change-Id: Id1bf103a1f5c2a1cde653d53110f28c903ae8768
Partial-Implements: blueprint ansible2
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 c206610b2..0edec146a 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -36,17 +36,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 \ |