aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-26 16:10:25 +0000
committerGerrit Code Review <review@openstack.org>2016-08-26 16:10:25 +0000
commit6f5703eb5dbff565f510c3a9d67d3e698eed535f (patch)
treed33e3aa2d1ca232f4d86f5a7b9393600c39d2745 /kolla
parentca100f1f3206daf5aeccaa58bad5b97ef22f4e30 (diff)
parentc096825075baf278f0319f194604f3c2a6ab21ec (diff)
downloadkolla-6f5703eb5dbff565f510c3a9d67d3e698eed535f.tar.gz
kolla-6f5703eb5dbff565f510c3a9d67d3e698eed535f.zip
Merge "Add etcd container"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 4be0bebce..2d455ab1b 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -34,7 +34,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
- default=['ceph', 'cron', 'mariadb', 'haproxy',
+ default=['ceph', 'cron', 'etcd', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'heka'],
help='Infra images'),