openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove data docker image"

Browse Source
This commit is contained in:
Jenkins 2016-02-10 19:19:24 +00:00 committed by Gerrit Code Review
commit d3731eb99f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/data/Dockerfile.j2
View File

@ -1,6 +0,0 @@
FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER {{ maintainer }}
CMD ["/bin/sleep", "infinity"]
{{ include_footer }}

4
kolla/common/config.py
View File

@ -25,7 +25,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'data', 'mariadb', 'haproxy',
default=['ceph', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'rsyslog'],
help='Infra images'),
@ -39,7 +39,7 @@ _PROFILE_OPTS = [
'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper'],
help='Aux Images'),
cfg.ListOpt('default',
default=['data', 'kolla-toolbox', 'glance', 'haproxy',
default=['kolla-toolbox', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'memcached', 'mariadb', 'neutron', 'nova',
'openvswitch', 'rabbitmq', 'rsyslog'],