aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-05 15:04:37 +0000
committerGerrit Code Review <review@openstack.org>2016-02-05 15:04:37 +0000
commitb891afd64c7bcd351cde324591dc4d915f550a51 (patch)
tree5ccbe37a6815e56bc565a84c15c095c7e657ceef /kolla
parent16630340c74163b8d9ba5bf370a458493fb85f0f (diff)
parent80b7266ed1b10fb302a507d250d28a964ce14e49 (diff)
downloadkolla-b891afd64c7bcd351cde324591dc4d915f550a51.tar.gz
kolla-b891afd64c7bcd351cde324591dc4d915f550a51.zip
Merge "Rename kolla_ansible to kolla_toolbox"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 04603fc13..446e9b1ae 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -26,7 +26,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'data', 'mariadb', 'haproxy',
- 'keepalived', 'kolla-ansible', 'memcached',
+ 'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'rsyslog'],
help='Infra images'),
cfg.ListOpt('main',
@@ -39,14 +39,14 @@ _PROFILE_OPTS = [
'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper'],
help='Aux Images'),
cfg.ListOpt('default',
- default=['data', 'kolla-ansible', 'glance', 'haproxy',
+ default=['data', 'kolla-toolbox', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'memcached', 'mariadb', 'neutron', 'nova',
'openvswitch', 'rabbitmq', 'rsyslog'],
help='Default images'),
cfg.ListOpt('gate',
default=['ceph', 'cinder', 'glance', 'haproxy', 'heat',
- 'horizon', 'keepalived', 'keystone', 'kolla-ansible',
+ 'horizon', 'keepalived', 'keystone', 'kolla-toolbox',
'mariadb', 'memcached', 'neutron', 'nova',
'openvswitch', 'rabbitmq', 'rsyslog'],
help='Gate images'),