x
/
kolla-mesos
Code Issues Proposed changes

Adjust profiles to already implemented services 

The new kolla-mesos CLI fails when some service in the profile
is not implemented. That required the following changes in all
profiles:
- remove the kolla-toolbox and openvswitch services, because
  they're included in the other ones
- remove the haproxy and keepalived profiles, because we will
  load balance services by the other more Mesos-compatible way
- remove all not yet implemented services (ceph, ceilometer,
  heat etc.)

TrivialFix

Change-Id: I6afe70c9b992e82debe9446661eb1da304952453
This commit is contained in:
Michal Rostecki 2016-03-21 10:14:29 +01:00
parent b1558c9a90
commit 4225243399
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
kolla_mesos/config/profiles.py
View File

@ -15,25 +15,26 @@ from oslo_config import cfg
CONF = cfg.CONF
profiles_opts = [
# TODO(nihilifer): Add ceph and mongodb when implemented.
cfg.ListOpt('infra',
default=['ceph', 'data', 'mariadb', 'haproxy', 'keepalived',
'kolla-toolbox', 'memcached', 'mongodb',
'openvswitch', 'rabbitmq']),
default=['mariadb', 'memcached', 'rabbitmq']),
# TODO(nihilifer): Add ceilometer, head and swift when implemented.
cfg.ListOpt('main',
default=['cinder', 'ceilometer', 'glance', 'heat', 'horizon',
'keystone', 'neutron', 'nova', 'swift']),
cfg.ListOpt('aux',
default=['designate', 'gnocchi', 'ironic', 'magnum', 'zaqar']),
default=['cinder', 'glance', 'horizon', 'keystone', 'neutron',
'nova']),
# TODO(nihilifer): Enable this profile when any of its services will be
# implemented.
# cfg.ListOpt('aux',
# default=['designate', 'gnocchi', 'ironic', 'magnum',
# 'zaqar']),
# TODO(nihilifer): Add heat when implemented.
cfg.ListOpt('default',
default=['data', 'kolla-toolbox', 'glance', 'haproxy', 'heat',
'horizon', 'keepalived', 'keystone', 'memcached',
'mariadb', 'neutron', 'nova', 'openvswitch',
'rabbitmq']),
default=['glance', 'horizon', 'keystone', 'memcached',
'mariadb', 'neutron', 'nova', 'rabbitmq']),
# TODO(nihilifer): Add ceph when implemented.
cfg.ListOpt('gate',
default=['ceph', 'cinder', 'data', 'dind', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'kolla-toolbox', 'mariadb', 'memcached', 'neutron',
'nova', 'openvswitch', 'rabbitmq'])
default=['cinder', 'glance', 'horizon', 'keystone', 'mariadb',
'memcached', 'neutron', 'nova', 'rabbitmq'])
]
profiles_opt_group = cfg.OptGroup(name='profiles',
title='Common sets of images')

5
kolla_mesos/tests/config/test_profiles_config.py
View File

@ -24,7 +24,6 @@ PROFILES_TEXT_CONFIG = """
[profiles]
infra = test1, test2
main = test1
aux = test1, test2, test3
default = test1, test2, test3, test4, test5
gate = test1, test2, test3, test4
"""
@ -35,7 +34,6 @@ class TestProfilesConfig(base.BaseTestCase):
def _asserts(self):
self.assertEqual(['test1', 'test2'], CONF.profiles.infra)
self.assertEqual(['test1'], CONF.profiles.main)
self.assertEqual(['test1', 'test2', 'test3'], CONF.profiles.aux)
self.assertEqual(['test1', 'test2', 'test3', 'test4',
'test5'], CONF.profiles.default)
self.assertEqual(['test1', 'test2', 'test3',
@ -43,8 +41,7 @@ class TestProfilesConfig(base.BaseTestCase):
def test_cli_config(self):
argv = ['--profiles-infra', 'test1,test2',
'--profiles-main', 'test1', '--profiles-aux',
'test1,test2,test3', '--profiles-default',
'--profiles-main', 'test1', '--profiles-default',
'test1,test2,test3,test4,test5', '--profiles-gate',
'test1,test2,test3,test4']
CONF(argv, project='kolla-mesos')