Merge "Gate: Attempt to fix a memory allocation error"
This commit is contained in:
commit
6f2cfe9bc2
|
@ -40,7 +40,7 @@ Create the necessary keypair and flavor::
|
||||||
|
|
||||||
source /opt/stack/devstack/openrc admin admin
|
source /opt/stack/devstack/openrc admin admin
|
||||||
nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
|
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
|
source /opt/stack/devstack/openrc demo demo
|
||||||
nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
|
nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
|
||||||
|
|
|
@ -95,7 +95,7 @@ nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
|
||||||
|
|
||||||
# Create magnum specific flavor for use in functional tests.
|
# Create magnum specific flavor for use in functional tests.
|
||||||
echo_summary "Create a flavor"
|
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
|
# Run functional tests
|
||||||
# Currently we support functional-api, functional-k8s, will support swarm,
|
# Currently we support functional-api, functional-k8s, will support swarm,
|
||||||
|
|
|
@ -117,6 +117,7 @@ class BaseMagnumClient(base.TestCase):
|
||||||
external_network_id=cls.nic_id,
|
external_network_id=cls.nic_id,
|
||||||
image_id=cls.image_id,
|
image_id=cls.image_id,
|
||||||
flavor_id=cls.flavor_id,
|
flavor_id=cls.flavor_id,
|
||||||
|
master_flavor_id=cls.flavor_id,
|
||||||
docker_volume_size=docker_volume_size,
|
docker_volume_size=docker_volume_size,
|
||||||
network_driver=network_driver,
|
network_driver=network_driver,
|
||||||
coe=coe,
|
coe=coe,
|
||||||
|
|
Loading…
Reference in New Issue