openstack
/
magnum
Code Issues Proposed changes

Merge "Gate: Attempt to fix a memory allocation error"

This commit is contained in:
Jenkins 2015-12-22 02:10:50 +00:00 committed by Gerrit Code Review
parent 2862a60203 958e63341a
commit 6f2cfe9bc2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/dev-functional-test.rst
View File

@ -40,7 +40,7 @@ Create the necessary keypair and flavor::
source /opt/stack/devstack/openrc admin admin
nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
nova flavor-create m1.magnum 100 2048 8 1
nova flavor-create m1.magnum 100 1024 8 1
source /opt/stack/devstack/openrc demo demo
nova keypair-add --pub-key ~/.ssh/id_rsa.pub default

2
magnum/tests/contrib/post_test_hook.sh
View File

@ -95,7 +95,7 @@ nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
# Create magnum specific flavor for use in functional tests.
echo_summary "Create a flavor"
nova flavor-create m1.magnum 100 2048 8 1
nova flavor-create m1.magnum 100 1024 8 1
# Run functional tests
# Currently we support functional-api, functional-k8s, will support swarm,

1
magnum/tests/functional/python_client_base.py
View File

@ -117,6 +117,7 @@ class BaseMagnumClient(base.TestCase):
external_network_id=cls.nic_id,
image_id=cls.image_id,
flavor_id=cls.flavor_id,
master_flavor_id=cls.flavor_id,
docker_volume_size=docker_volume_size,
network_driver=network_driver,
coe=coe,