aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-18 16:03:49 +0000
committerGerrit Code Review <review@openstack.org>2019-06-18 16:03:49 +0000
commitb8a0ed5dfafd7409aab6fa6b494cb05c6a9239f4 (patch)
tree4fb0daddf098ff78f41fea4e30bc2e6ae7fa3c0e /docker/base
parent3b61de2d3193611506ebee37afa3f622ba1b8ecc (diff)
parentc63f817730a66761b45607afa201ebae300452c2 (diff)
downloadkolla-b8a0ed5dfafd7409aab6fa6b494cb05c6a9239f4.tar.gz
kolla-b8a0ed5dfafd7409aab6fa6b494cb05c6a9239f4.zip
Merge "Remove crane image"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j21
-rw-r--r--docker/base/crane.repo7
2 files changed, 0 insertions, 8 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d7048f076..1dd20b42b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -76,7 +76,6 @@ COPY yum.conf /etc/yum.conf
{% if base_arch == 'x86_64' %}
{% set base_yum_repo_files = [
'ceph.repo',
- 'crane.repo',
'elasticsearch.repo',
'grafana.repo',
'influxdb.repo',
diff --git a/docker/base/crane.repo b/docker/base/crane.repo
deleted file mode 100644
index 55d7084d7..000000000
--- a/docker/base/crane.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-# TODO(mandre) Remove when crane is in centos repos
-# NOTE python-crane package is not signed
-[pulp-2-testing]
-name=Pulp 2 Testing
-baseurl=https://repos.fedorapeople.org/pulp/pulp/testing/automation/2-master/stage/7Server/$basearch/
-enabled=1
-gpgcheck=0