openstack
/
zun
Code Issues Proposed changes

Merge "Tune the default cpu/memory/disk"

This commit is contained in:
Zuul 2018-05-17 14:08:06 +00:00 committed by Gerrit Code Review
parent 03bc743d75 89ccde5cd5
commit da4fad1e5f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/zun
View File

@ -179,6 +179,9 @@ function create_zun_conf {
fi
iniset $ZUN_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
iniset $ZUN_CONF DEFAULT my_ip "$HOST_IP"
iniset $ZUN_CONF DEFAULT default_cpu 0
iniset $ZUN_CONF DEFAULT default_memory 0
iniset $ZUN_CONF DEFAULT default_disk 0
iniset $ZUN_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
iniset $ZUN_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $ZUN_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST

2
zun/conf/container_driver.py
View File

@ -78,7 +78,7 @@ in Zun is ``runc``."""),
help='The maximum disk size in GB that user can set '
'when run/create container.'),
cfg.IntOpt('default_memory',
default=512,
default=2048,
help='The default memory in MB a container can use '
'(will be used if user do not specify '
'container\'s memory). This value should be '

4
zun/tests/unit/api/controllers/v1/test_containers.py
View File

@ -318,7 +318,7 @@ class TestContainerController(api_base.FunctionalTest):
self.assertIsNotNone(c.get('uuid'))
self.assertIsNotNone(c.get('name'))
self.assertIsNone(c.get('command'))
self.assertEqual('512', c.get('memory'))
self.assertEqual('2048', c.get('memory'))
self.assertEqual(1.0, c.get('cpu'))
# TODO(kiennt): Uncomment it when bug [1] be resolved.
# At this time, limit disk size feature will be ready.
@ -358,7 +358,7 @@ class TestContainerController(api_base.FunctionalTest):
self.assertIsNotNone(c.get('uuid'))
self.assertEqual('MyDocker', c.get('name'))
self.assertEqual('env', c.get('command'))
self.assertEqual('512', c.get('memory'))
self.assertEqual('2048', c.get('memory'))
self.assertEqual(1.0, c.get('cpu'))
# TODO(kiennt): Uncomment it when bug [1] be resolved.
# At this time, limit disk size feature will be ready.