From fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Tue, 3 May 2016 08:35:22 -0400
Subject: Cleanup Mesos/Marathon related work

We got rid of the kolla-mesos repo:
http://git.openstack.org/cgit/openstack/kolla-mesos/tree/README.rst

So we don't need things in the main kolla tree
related to Mesos/Marathon

Closes-Bug: #1577951
Change-Id: Iafae63914c8a6601dc1b5b04231af8a1d2cc8642
---
 kolla/common/config.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'kolla')

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 = [
-- 
cgit v1.2.3