diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-10 10:32:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-10 10:32:17 +0000 |
| commit | bbab10815ceb23993aa29a1743bfe2b3cbd87f6e (patch) | |
| tree | 60808e277e64e1704d8de848efa5e8c3969bfc4d /kolla | |
| parent | 451d0fc023c9a167364cfa15cead808f74d9ac67 (diff) | |
| parent | e1b37f5444bae2400490917b697a18b03c90cace (diff) | |
| download | kolla-bbab10815ceb23993aa29a1743bfe2b3cbd87f6e.tar.gz kolla-bbab10815ceb23993aa29a1743bfe2b3cbd87f6e.zip | |
Merge "Add a tripleoclient container"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ee4fbd268..a6bdbc08b 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -779,6 +779,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/tempest/' 'tempest-master.tar.gz')}, + 'tripleoclient': { + 'type': 'url', + 'location': ('$tarballs_base/python-tripleoclient/' + 'tripleoclient-master.tar.gz')}, 'tripleo-ui': { 'type': 'url', 'location': ('$tarballs_base/tripleo-ui/' diff --git a/kolla/image/build.py b/kolla/image/build.py index c974be9e8..f58848401 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -96,6 +96,7 @@ SKIPPED_IMAGES = { ], 'centos+source': [ "ovsdpdk", + "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 "tripleo-ui" @@ -124,6 +125,7 @@ SKIPPED_IMAGES = { "searchlight-base", "solum-base", "tacker-base", + "tripleoclient", "tripleo-ui", "vitrage-base", "vmtp", @@ -133,6 +135,7 @@ SKIPPED_IMAGES = { 'ubuntu+source': [ # There is no qdrouterd package for ubuntu bionic "qdrouterd", + "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 "tripleo-ui" @@ -160,6 +163,7 @@ SKIPPED_IMAGES = { "sensu-base", "solum-base", "tacker-base", + "tripleoclient", "tripleo-ui", "vitrage-base", "vmtp", @@ -168,6 +172,7 @@ SKIPPED_IMAGES = { ], 'debian+source': [ "sensu-base", + "tripleoclient", "tripleo-ui" ], 'oraclelinux+binary': [ @@ -190,6 +195,7 @@ SKIPPED_IMAGES = { 'oraclelinux+source': [ "bifrost-base", "ovsdpdk", + "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 "tripleo-ui" |