From c747396207277040f5fe4e1737c6abc053111d7b Mon Sep 17 00:00:00 2001
From: Adam Harwell <flux.adam@gmail.com>
Date: Wed, 7 Mar 2018 06:28:50 -0800
Subject: [PATCH] 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 1020a3bceb296610c442ed0d445bba594f27b3de)
---
 devstack/plugin.sh                                            | 2 +-
 diskimage-create/diskimage-create.sh                          | 4 ++--
 .../legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 5fc8b5d647..ee3438747b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -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
 }
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 4ba0b9b6ec..2823d9f1bc 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -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
 
diff --git a/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
index de7fe7c04c..d8d5176934 100644
--- a/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
+++ b/playbooks/legacy/octavia-v1-dsvm-scenario-kvm-centos.7/run.yaml
@@ -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