From 367e44bdddc01ece68a14e6f3524d8e4b16f8716 Mon Sep 17 00:00:00 2001
From: "REDDY, CHINASUBBA" <chinasubbareddy@gmail.com>
Date: Thu, 14 Jun 2018 15:12:10 -0500
Subject: [PATCH] make proxy falvor configurable like other flavors

https://bugs.launchpad.net/kloudbuster/+bug/1766372

Change-Id: Ib38bbfaf6c6f58b9cd44961967859e76ee441cdf
---
 kloudbuster/cfg.scale.yaml | 10 ++++++++++
 kloudbuster/kloudbuster.py |  9 ++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kloudbuster/cfg.scale.yaml b/kloudbuster/cfg.scale.yaml
index 52ddff4..459da7d 100644
--- a/kloudbuster/cfg.scale.yaml
+++ b/kloudbuster/cfg.scale.yaml
@@ -154,6 +154,16 @@ client:
         # example:
         #extra_specs:
             #"hw:cpu_policy": dedicated
+    # Flavor to use for proxy instance
+    proxy_flavor:
+        # Number of vCPUs for the flavor
+        vcpus: 1
+        # Memory for the flavor in MB
+        ram: 2048
+        # Size of local disk in GB
+        disk: 0
+        # Size of ephemeral disk in GB
+        ephemeral: 0
 
     # Assign floating IP for every client side test VM
     # Default: no floating IP (only assign internal fixed IP)
diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py
index 3eaa28d..18d25c4 100755
--- a/kloudbuster/kloudbuster.py
+++ b/kloudbuster/kloudbuster.py
@@ -183,13 +183,8 @@ class Kloud(object):
             else:
                 flavor_dict['ephemeral'] = 0
             if self.testing_side:
-                proxy_flavor = {
-                    "vcpus": 1,
-                    "ram": 2048,
-                    "disk": 0,
-                    "ephemeral": 0
-                }
-                create_flavor(flavor_manager, FLAVOR_KB_PROXY, proxy_flavor, extra_specs)
+                proxy_flavor_dict = self.scale_cfg.proxy_flavor
+                create_flavor(flavor_manager, FLAVOR_KB_PROXY, proxy_flavor_dict, extra_specs)
                 create_flavor(flavor_manager, FLAVOR_KB_CLIENT, flavor_dict, extra_specs)
             else:
                 create_flavor(flavor_manager, FLAVOR_KB_SERVER, flavor_dict, extra_specs)