openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use openstack/requirements for repeatable builds"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 14:58:07 +00:00 committed by Gerrit Code Review
commit 2f1cc59b56
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/openstack-base/Dockerfile.j2
View File

@ -73,10 +73,12 @@ RUN apt-get install -y --no-install-recommends \
{% endif %} {% endif %}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ ADD openstack-base-archive /openstack-base-source
RUN ln -s openstack-base-source/* /requirements \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \ && python get-pip.py \
&& rm get-pip.py \ && rm get-pip.py \
&& pip --no-cache-dir install -U \ && pip --no-cache-dir install -U -c requirements/upper-constraints.txt \
python-barbicanclient \ python-barbicanclient \
python-ceilometerclient \ python-ceilometerclient \
python-congressclient \ python-congressclient \

5
etc/kolla/kolla-build.conf
View File

@ -56,6 +56,11 @@
# reference: stable # git reference to pull, commit sha, tag or branch name # reference: stable # git reference to pull, commit sha, tag or branch name
# # pulls from master branch unless specified otherwise # # pulls from master branch unless specified otherwise
[openstack-base]
type = git
location = https://github.com/openstack/requirements.git
reference = master
[ceilometer-base] [ceilometer-base]
type = url type = url
location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz