openstack/zun
Code Issues Proposed changes

Merge "Change sandbox flavor from 'm1.small' to 'm1.tiny'"

Browse Source
This commit is contained in:
Jenkins 2017-02-27 00:00:43 +00:00 committed by Gerrit Code Review
commit 257d99209f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zun/container/docker/driver.py
View File

@ -392,7 +392,7 @@ class DockerDriver(driver.ContainerDriver):
class NovaDockerDriver(DockerDriver):
def create_sandbox(self, context, container, key_name=None,
flavor='m1.small', image='kubernetes/pause',
flavor='m1.tiny', image='kubernetes/pause',
nics='auto'):
# FIXME(hongbin): We elevate to admin privilege because the default
# policy in nova disallows non-admin users to create instance in

2
zun/tests/unit/container/docker/test_docker_driver.py
View File

@ -472,7 +472,7 @@ class TestNovaDockerDriver(base.DriverTestCase):
mock_get_sandbox_name.assert_called_once_with(mock_container)
nova_client_instance.create_server.assert_called_once_with(
name='test_sanbox_name', image='kubernetes/pause',
flavor='m1.small', key_name=None,
flavor='m1.tiny', key_name=None,
nics='auto', availability_zone=':{0}:'.format(conf.CONF.host))
mock_ensure_active.assert_called_once_with(nova_client_instance,
'server_instance')