From 4d1fa3cb90eae56b9314d71c4ccfa1428f61d1fd Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Sun, 1 May 2016 23:04:39 +0800
Subject: [PATCH] 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
---
docker/kolla-toolbox/Dockerfile.j2 | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index c206610b28..0edec146a6 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 \