From 4f9ee9f1324fb05eff6be4cf5c4b00f8bb29bf7c Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 23 Aug 2018 08:22:04 -0400
Subject: Add crane docker image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Crane is a lightweight 'pull only' container registry
implementation.

TripleO is aiming to replace our use of docker-distribution
with crane for the Undercloud.

Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I59d9521f99243401d7703a3dedc26b5baed2d595
---
 kolla/common/config.py | 4 ++++
 kolla/image/build.py   | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'kolla')

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 18cfe9e3d..dd190cdbc 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -323,6 +323,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/cloudkitty/'
                      'cloudkitty-master.tar.gz')},
+    'crane': {
+        'type': 'git',
+        'reference': 'master',
+        'location': ('https://github.com/pulp/crane.git')},
     'designate-base': {
         'type': 'url',
         'location': ('$tarballs_base/designate/'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index f58848401..9b41dd3a6 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -99,7 +99,7 @@ SKIPPED_IMAGES = {
         "tripleoclient",
         # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
         # https://bugs.launchpad.net/tripleo/+bug/1744215
-        "tripleo-ui"
+        "tripleo-ui",
     ],
     'ubuntu+binary': [
         "almanach-base",
@@ -107,6 +107,7 @@ SKIPPED_IMAGES = {
         "blazar-base",
         "cloudkitty-base",
         "congress-base",
+        "crane",
         "dragonflow-base",
         "ec2-api",
         "freezer-base",
@@ -133,6 +134,7 @@ SKIPPED_IMAGES = {
         "zun-base",
     ],
     'ubuntu+source': [
+        "crane",
         # There is no qdrouterd package for ubuntu bionic
         "qdrouterd",
         "tripleoclient",
@@ -146,6 +148,7 @@ SKIPPED_IMAGES = {
         "blazar-base",
         "cloudkitty-base",
         "congress-base",
+        "crane",
         "dragonflow-base",
         "ec2-api",
         "freezer-base",
@@ -171,6 +174,7 @@ SKIPPED_IMAGES = {
         "zun-base"
     ],
     'debian+source': [
+        "crane",
         "sensu-base",
         "tripleoclient",
         "tripleo-ui"
@@ -179,6 +183,7 @@ SKIPPED_IMAGES = {
         "almanach-base",
         "bifrost-base",
         "blazar-base",
+        "crane",
         "dragonflow-base",
         "freezer-base",
         "karbor-base",
-- 
cgit v1.2.3