diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2016-05-03 08:35:22 -0400 |
|---|---|---|
| committer | Davanum Srinivas (dims) <davanum@gmail.com> | 2016-05-03 21:39:57 +0000 |
| commit | fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f (patch) | |
| tree | 9aedb685dc7b59b61f4017465a792e81352f9b19 /kolla | |
| parent | 31d1271f1e0f19f1326c2e3858c5b0a2dc3c59ba (diff) | |
| download | kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.tar.gz kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.zip | |
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
Diffstat (limited to 'kolla')
| -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 = [ |