From ce5e8a8257eb5e5d63074062e76a20e57f170e13 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 10 Feb 2016 22:46:22 +0800 Subject: [PATCH] Remove data docker image we have moved to named volume, the old data container should be removed TrivialFix Change-Id: Ib73205de6566509492568381179814baa7af2d22 --- docker/data/Dockerfile.j2 | 6 ------ kolla/common/config.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 docker/data/Dockerfile.j2 diff --git a/docker/data/Dockerfile.j2 b/docker/data/Dockerfile.j2 deleted file mode 100644 index 17cd85b1b6..0000000000 --- a/docker/data/Dockerfile.j2 +++ /dev/null @@ -1,6 +0,0 @@ -FROM {{ base_distro }}:{{ base_distro_tag }} -MAINTAINER {{ maintainer }} - -CMD ["/bin/sleep", "infinity"] - -{{ include_footer }} diff --git a/kolla/common/config.py b/kolla/common/config.py index 446e9b1ae5..0e757af6e0 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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'],