openstack/kolla-ansible
Code Issues Proposed changes

Merge "Bump the ansible version to >2 in the kolla-toolbox"

Browse Source
This commit is contained in:
Jenkins 2016-06-09 11:19:28 +00:00 committed by Gerrit Code Review
commit 9fbf4ef485
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/kolla-toolbox/Dockerfile.j2
View File

@ -42,17 +42,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& rm get-pip.py \ && rm get-pip.py \
&& pip --no-cache-dir install pytz \ && pip --no-cache-dir install pytz \
&& pip --no-cache-dir install \ && pip --no-cache-dir install \
'ansible>2' \
MySQL-python \ MySQL-python \
os-client-config==1.16.0 \ os-client-config==1.16.0 \
pyudev \ pyudev \
shade==1.4.0 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 \ RUN useradd --user-group ansible --groups kolla \
&& mkdir -p /etc/ansible /usr/share/ansible \ && mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \