Merge "Add missing container image names to build config file"

This commit is contained in:
Jenkins 2016-08-29 13:54:56 +00:00 committed by Gerrit Code Review
commit cb32b2b8d9

View File

@ -34,9 +34,10 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'cron', 'etcd', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'heka'],
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',
@ -44,9 +45,10 @@ _PROFILE_OPTS = [
'swift'],
help='Main images'),
cfg.ListOpt('aux',
default=['aodh', 'designate', 'gnocchi', 'ironic',
'magnum', 'mistral', 'trove,' 'zaqar',
'congress'],
default=['aodh', 'congress', 'designate', 'gnocchi',
'influxdb', 'ironic', 'kuryr', 'magnum', 'manila',
'mistral', 'murano', 'rally', 'sahara', 'senlin',
'telegraf', 'trove', 'zaqar'],
help='Aux Images'),
cfg.ListOpt('default',
default=['cron', 'kolla-toolbox', 'glance', 'haproxy',