openstack
/
kolla
Code Issues Proposed changes

Fix Kolla gate 

There are two issue in kolla gate now. Since source building is voting,
we have to squash these two fixes into one

Disable gpgcheck in grafana repo

Seems there is something wrong in grafana repo gpg key. Disable gpgcheck
until it is fixed

Partial-Bug: #1664272

Add VENV variable in bifrost base Dockerfile

* ANSIBLE_FROM_PYPI is removed in bifrost.
* Only when VENV exist, ansible is installed in global rather then root
  user

Change-Id: Ib96433e6d2a03941cace8ed15dafbb314c4551eb
This commit is contained in:
Jeffrey Zhang 2017-02-13 23:19:05 +08:00
parent 2b92e24832
commit db9162a841
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/grafana.repo
View File

@ -3,5 +3,6 @@ name=grafana
baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
repo_gpgcheck=1
enabled=1
gpgcheck=1
# TODO(jeffrey4l), enable gpg check when grafana gpgkey is OK.
gpgcheck=0
gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana

2
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -13,7 +13,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/fa
{% elif install_type == 'source' %}
ENV ANSIBLE_FROM_PYPI True
ENV VENV /var/lib/kolla/venv
ADD bifrost-base-archive /bifrost-base-source
COPY build_arg.yml /tmp/build_arg.yml