diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-13 23:19:05 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-14 13:28:10 +0800 |
| commit | db9162a841d7283dfa01e37afa7a0aefc3123630 (patch) | |
| tree | a2b1ac64ea91ac40bb2a1432364f1cba84b7ddbd | |
| parent | 2b92e248322ab2e73908eae3c411ffa92e9fccf5 (diff) | |
| download | kolla-db9162a841d7283dfa01e37afa7a0aefc3123630.tar.gz kolla-db9162a841d7283dfa01e37afa7a0aefc3123630.zip | |
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
| -rw-r--r-- | docker/base/grafana.repo | 3 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo index dc8d30b44..b21cd166b 100644 --- a/docker/base/grafana.repo +++ b/docker/base/grafana.repo @@ -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 diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 43091fc13..796b06318 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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 |