openstack
/
tripleo-ci
Code Issues Proposed changes

Use swap-partition.yaml environment 

Instead of using the environment file to create a swap file, use the one
that enables swap on a precreated partition. To create the partition, we
recreate the baremetal flavor so that Ironic allocates 1GB for swap in a
seperate partition.

Change-Id: Ie64a80fe72c7e2f1e6bfb3c3c3da0f6bc561e453
Depends-On: I5cd68c13dbfe53eecf6c6ad93151eadc980a902d
Depends-On: Ia2a10318de47854a9b8932d72243ce0a85603556
Partial-Bug: #1553243
This commit is contained in:
James Slagle 2016-03-06 16:09:18 -05:00
parent d78b530d2f
commit b20f6022e4
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/deploy.sh
View File

@ -63,6 +63,13 @@ fi
sleep 60
unset http_proxy
# Recreate the baremetal flavor to add a swap partition
source stackrc
nova flavor-delete baremetal
nova flavor-create --swap 1024 baremetal auto 4096 39 1
nova flavor-key baremetal set capabilities:boot_option=local
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /tmp/worker-config.yaml"
/tmp/tripleo-common/scripts/tripleo.sh --overcloud-deploy ${TRIPLEO_SH_ARGS:-}

2
test-environments/swapfile.yaml → test-environments/swap-partition.yaml
View File

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::AllNodesExtraConfig: /usr/share/openstack-tripleo-heat-templates/extraconfig/all_nodes/swap.yaml
OS::TripleO::AllNodesExtraConfig: /usr/share/openstack-tripleo-heat-templates/extraconfig/all_nodes/swap-partition.yaml

2
toci_gate_test.sh
View File

@ -32,7 +32,7 @@ export PACEMAKER=0
# in under the gate timeout so we can collect logs.
OVERCLOUD_DEPLOY_TIMEOUT=$((DEVSTACK_GATE_TIMEOUT-90))
export OVERCLOUD_DEPLOY_ARGS="--libvirt-type=qemu -t $OVERCLOUD_DEPLOY_TIMEOUT"
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /tmp/swapfile.yaml"
export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /tmp/swap-partition.yaml"
export TRIPLEO_SH_ARGS=
export NETISO_V4=0