aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-24 15:16:32 +0000
committerGerrit Code Review <review@openstack.org>2016-11-24 15:16:32 +0000
commita8a1c4cc3d0f42e96e0436d9125614cd2c3679fd (patch)
treeefdc3f58bdf81154a4b36cdf5d814df33f15a674 /kolla
parent4208c7a7cf90157c3e081298b845eb5987536eea (diff)
parent2d8be6bee4750754cdf482cde44627c000961895 (diff)
downloadkolla-a8a1c4cc3d0f42e96e0436d9125614cd2c3679fd.tar.gz
kolla-a8a1c4cc3d0f42e96e0436d9125614cd2c3679fd.zip
Merge "Add octavia docker image"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 6c7b734df..1c3c5d2e4 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -48,8 +48,8 @@ _PROFILE_OPTS = [
default=['aodh', 'cloudkitty', 'congress', 'designate',
'freezer', 'gnocchi', 'influxdb', 'ironic', 'karbor',
'kuryr', 'magnum', 'manila', 'mistral', 'murano',
- 'panko', 'rally', 'sahara', 'searchlight', 'senlin',
- 'solum', 'telegraf', 'trove', 'zaqar'],
+ 'octavia', 'panko', 'rally', 'sahara', 'searchlight',
+ 'senlin', 'solum', 'telegraf', 'trove', 'zaqar'],
help='Aux Images'),
cfg.ListOpt('default',
default=['chrony', 'cron', 'kolla-toolbox', 'glance',
@@ -286,6 +286,10 @@ SOURCES = {
'type': 'url',
'location': ('http://github.com/kanaka/noVNC/tarball/'
'v0.5.1')},
+ 'octavia-base': {
+ 'type': 'url',
+ 'location': ('http://tarballs.openstack.org/octavia/'
+ 'octavia-master.tar.gz')},
'panko-base': {
'type': 'url',
'location': ('http://tarballs.openstack.org/panko/'