Fix kvm-centos.7 gate
Somehow it was pulling in barbican-tempest-plugin incorrectly, and
didn't have image size set right for centos.
Also fix the devstack plugin to size the flavor correctly based on the
image size variable.
Change-Id: I724f5064309d07fe05f86fcf2c7a488d9319e54c
(cherry picked from commit 1020a3bceb
)
This commit is contained in:
parent
44f5e226bf
commit
c747396207
|
@ -391,7 +391,7 @@ function configure_octavia_tempest {
|
|||
|
||||
function create_amphora_flavor {
|
||||
# Pass even if it exists to avoid race condition on multinode
|
||||
openstack flavor create --id auto --ram 1024 --disk 2 --vcpus 1 --private m1.amphora -f value -c id || true
|
||||
openstack flavor create --id auto --ram 1024 --disk ${OCTAVIA_AMP_IMAGE_SIZE:-2} --vcpus 1 --private m1.amphora -f value -c id || true
|
||||
amp_flavor_id=$(openstack flavor show m1.amphora -f value -c id)
|
||||
iniset $OCTAVIA_CONF controller_worker amp_flavor_id $amp_flavor_id
|
||||
}
|
||||
|
|
|
@ -193,8 +193,8 @@ AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0}
|
|||
|
||||
AMP_ENABLE_FULL_MAC_SECURITY=${AMP_ENABLE_FULL_MAC_SECURITY:-0}
|
||||
|
||||
if [ "$AMP_BASEOS" = "rhel" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then
|
||||
echo "RHEL based amphora requires an image size of at least 3GB"
|
||||
if [ "$AMP_BASEOS" = "rhel" -o "$AMP_BASEOS" = "centos" ] && [ "$AMP_IMAGESIZE" -lt 3 ]; then
|
||||
echo "RHEL/centos based amphora requires an image size of at least 3GB"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
OCTAVIA_HYPERVISOR=kvm
|
||||
OCTAVIA_AMP_BASE_OS=centos
|
||||
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID=7
|
||||
OCTAVIA_AMP_IMAGE_SIZE=3
|
||||
|
||||
EOF
|
||||
executable: /bin/bash
|
||||
|
|
Loading…
Reference in New Issue