diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-11 09:18:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-11 09:18:42 +0000 |
| commit | 649094f9d26382a8a08b2cd35e15ba2d815df7cb (patch) | |
| tree | 4394fad9d5cb56e95a2361375c9048d537155f9f /kolla | |
| parent | e3ad9538bbd4b37c6260225e4b84f60f34dc43a7 (diff) | |
| parent | 4f9ee9f1324fb05eff6be4cf5c4b00f8bb29bf7c (diff) | |
| download | kolla-649094f9d26382a8a08b2cd35e15ba2d815df7cb.tar.gz kolla-649094f9d26382a8a08b2cd35e15ba2d815df7cb.zip | |
Merge "Add crane docker image"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 6991f2662..031c8d834 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", |