diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-04 15:20:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-04 15:20:10 +0000 |
| commit | f54783614023e7e0f83de7d59fbe07072357658f (patch) | |
| tree | 5d19c5b114f5bc74d5e71c1040b8a0fff68e2a71 /kolla/common | |
| parent | f2472171562b85287a251d57723589e9fb55f8ab (diff) | |
| parent | fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f (diff) | |
| download | kolla-f54783614023e7e0f83de7d59fbe07072357658f.tar.gz kolla-f54783614023e7e0f83de7d59fbe07072357658f.zip | |
Merge "Cleanup Mesos/Marathon related work"
Diffstat (limited to 'kolla/common')
| -rw-r--r-- | kolla/common/config.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 5336a6240..6ccbdf780 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -49,11 +49,7 @@ _PROFILE_OPTS = [ default=['cron', 'glance', 'haproxy', 'keepalived', 'keystone', 'kolla-toolbox', 'mariadb', 'memcached', 'neutron', 'nova', 'openvswitch', 'rabbitmq', 'heka'], - help='Gate images'), - cfg.ListOpt('mesos', - default=['chronos', 'marathon', 'mesos-dns', 'mesos-master', - 'mesos-slave', 'zookeeper'], - help='Mesos images') + help='Gate images') ] _CLI_OPTS = [ |
