diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-20 11:47:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-20 11:47:40 +0000 |
| commit | 4ba6dad284ba1ef353149a08f4f6d1d8f7910e4e (patch) | |
| tree | c3fc6b3cc8f0de0722adb47137329cb824ca0388 | |
| parent | 615bfa84e847ca3aa049cde606deaac10421af5a (diff) | |
| parent | 7c76511b19638c9e9ff10f2f79167ab82c842349 (diff) | |
| download | kolla-4ba6dad284ba1ef353149a08f4f6d1d8f7910e4e.tar.gz kolla-4ba6dad284ba1ef353149a08f4f6d1d8f7910e4e.zip | |
Merge "Split config list into lines"
| -rw-r--r-- | kolla/common/config.py | 113 |
1 files changed, 93 insertions, 20 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index edebd5022..0ec595970 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -34,34 +34,107 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] _PROFILE_OPTS = [ cfg.ListOpt('infra', - default=['ceph', 'cron', 'elasticsearch', 'etcd', 'haproxy', - 'heka', 'keepalived', 'kibana', 'kolla-toolbox', - 'mariadb', 'memcached', 'mongodb', 'openvswitch', - 'rabbitmq', 'tgtd'], + default=[ + 'ceph', + 'cron', + 'elasticsearch', + 'etcd', + 'haproxy', + 'heka', + 'keepalived', + 'kibana', + 'kolla-toolbox', + 'mariadb', + 'memcached', + 'mongodb', + 'openvswitch', + 'rabbitmq', + 'tgtd', + ], help='Infra images'), cfg.ListOpt('main', - default=['cinder', 'ceilometer', 'glance', 'heat', - 'horizon', 'iscsi', 'keystone', 'neutron', 'nova', - 'swift'], + default=[ + 'ceilometer', + 'cinder', + 'glance', + 'heat', + 'horizon', + 'iscsi', + 'keystone', + 'neutron', + 'nova', + 'swift', + ], help='Main images'), cfg.ListOpt('aux', - default=['aodh', 'cloudkitty', 'congress', 'designate', - 'freezer', 'gnocchi', 'influxdb', 'ironic', 'kafka', - 'karbor', 'kuryr', 'magnum', 'manila', 'mistral', - 'monasca', 'murano', 'octavia', 'panko', 'rally', - 'sahara', 'searchlight', 'senlin', 'solum', 'tacker', - 'telegraf', 'trove', 'zaqar', 'zookeeper'], + default=[ + 'aodh', + 'cloudkitty', + 'congress', + 'designate', + 'freezer', + 'gnocchi', + 'influxdb', + 'ironic', + 'kafka', + 'karbor', + 'kuryr', + 'magnum', + 'manila', + 'mistral', + 'monasca', + 'murano', + 'octavia', + 'panko', + 'rally', + 'sahara', + 'searchlight', + 'senlin', + 'solum', + 'tacker', + 'telegraf', + 'trove', + 'zaqar', + 'zookeeper', + ], help='Aux Images'), cfg.ListOpt('default', - default=['chrony', 'cron', 'kolla-toolbox', 'glance', - 'haproxy', 'heat', 'horizon', 'keepalived', - 'keystone', 'memcached', 'mariadb', 'neutron', 'nova', - 'openvswitch', 'rabbitmq', 'heka'], + default=[ + 'chrony', + 'cron', + 'kolla-toolbox', + 'glance', + 'haproxy', + 'heat', + 'heka', + 'horizon', + 'keepalived', + 'keystone', + 'mariadb', + 'memcached', + 'neutron', + 'nova', + 'openvswitch', + 'rabbitmq', + ], help='Default images'), cfg.ListOpt('gate', - default=['chrony', 'cron', 'glance', 'haproxy', 'keepalived', - 'keystone', 'kolla-toolbox', 'mariadb', 'memcached', - 'neutron', 'nova', 'openvswitch', 'rabbitmq', 'heka'], + default=[ + 'chrony', + 'cron', + 'glance', + 'haproxy', + 'heka', + 'keepalived', + 'keystone', + 'kolla-toolbox', + 'mariadb', + 'memcached', + 'neutron', + 'nova', + 'openvswitch', + 'rabbitmq', + ], help='Gate images') ] |