aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-14 10:27:58 +0000
committerGerrit Code Review <review@openstack.org>2016-11-14 10:27:58 +0000
commit1d5754f2c60ae2fa0b2e1671b1a81d4d88ed0346 (patch)
tree7b412e5dcaafa68e76abb92e0ddd1458c707b214 /kolla
parent8b1880fc3500eba4ee077cb5a1e2cf567155552e (diff)
parent2dae2f080ca814cfc6c753159540a74778ad1c33 (diff)
downloadkolla-1d5754f2c60ae2fa0b2e1671b1a81d4d88ed0346.tar.gz
kolla-1d5754f2c60ae2fa0b2e1671b1a81d4d88ed0346.zip
Merge "Add karbor container"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 72c87e497..6c7b734df 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -46,10 +46,10 @@ _PROFILE_OPTS = [
help='Main images'),
cfg.ListOpt('aux',
default=['aodh', 'cloudkitty', 'congress', 'designate',
- 'freezer', 'gnocchi', 'influxdb', 'ironic', 'kuryr',
- 'magnum', 'manila', 'mistral', 'murano', 'panko',
- 'rally', 'sahara', 'searchlight', 'senlin', 'solum',
- 'telegraf', 'trove', 'zaqar'],
+ 'freezer', 'gnocchi', 'influxdb', 'ironic', 'karbor',
+ 'kuryr', 'magnum', 'manila', 'mistral', 'murano',
+ 'panko', 'rally', 'sahara', 'searchlight', 'senlin',
+ 'solum', 'telegraf', 'trove', 'zaqar'],
help='Aux Images'),
cfg.ListOpt('default',
default=['chrony', 'cron', 'kolla-toolbox', 'glance',
@@ -226,6 +226,10 @@ SOURCES = {
'type': 'url',
'location': ('http://tarballs.openstack.org/ironic-inspector/'
'ironic-inspector-master.tar.gz')},
+ 'karbor-base': {
+ 'type': 'url',
+ 'location': ('http://tarballs.openstack.org/karbor/'
+ 'karbor-master.tar.gz')},
'keystone-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/keystone/'