From db9162a841d7283dfa01e37afa7a0aefc3123630 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 13 Feb 2017 23:19:05 +0800 Subject: 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 --- docker/base/grafana.repo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/base') 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 -- cgit v1.2.3