diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-20 16:23:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-20 16:23:43 +0000 |
| commit | 08f907a2cc67d61ae354c6ba8de1905c4f1b96c8 (patch) | |
| tree | f0a809e21f8ef399eb783ca6e39315279e312e31 /kolla | |
| parent | 7609cc242899d6bc0151f2e19392a9fa3555e29c (diff) | |
| parent | 679014a052f3daedf1e5d6d2a476b203b2fa33f8 (diff) | |
| download | kolla-08f907a2cc67d61ae354c6ba8de1905c4f1b96c8.tar.gz kolla-08f907a2cc67d61ae354c6ba8de1905c4f1b96c8.zip | |
Merge "Add Dockerfiles for Mesos"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 2d0bdef4d..9e9e2332b 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -36,7 +36,7 @@ _PROFILE_OPTS = [ help='Main images'), cfg.ListOpt('aux', default=['aodh', 'designate', 'gnocchi', 'ironic', - 'magnum', 'mistral', 'trove,' 'zaqar'], + 'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper'], help='Aux Images'), cfg.ListOpt('default', default=['data', 'kolla-ansible', 'glance', 'haproxy', @@ -50,7 +50,11 @@ _PROFILE_OPTS = [ 'keystone', 'kolla-ansible', 'mariadb', 'memcached', 'neutron', 'nova', 'openvswitch', 'rabbitmq', 'rsyslog'], - help='Gate images') + help='Gate images'), + cfg.ListOpt('mesos', + default=['chronos', 'marathon', 'mesos-master', 'mesos-slave', + 'zookeeper'], + help='Mesos images') ] _CLI_OPTS = [ |