From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Tue, 9 Oct 2018 16:24:51 +0000 (-0500)
Subject: Add lf flavors
X-Git-Tag: v0.26.0~7
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F12906%2F5;p=releng%2Fglobal-jjb.git

Add lf flavors

The lf flavors are the same as the v2 flavors with the addition of
a 30gb root disk attached. Also reordered the list.

Change-Id: I9989759328b0d6d22ebf7c870e9f4dcbcdcfa253
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index 44da8f4d..ed72f745 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -129,6 +129,20 @@ get_minion_options() {
     # Create a flavor mapping to manage hardware_id until OpenStack Cloud
     # plugin supports using names
     declare -A flavors
+    flavors["lf-highcpu-2"]="1051d06a-61ea-45e3-b9b4-93de92880b27"
+    flavors["lf-highcpu-4"]="35eb8e11-490f-4d1a-9f19-76091fc04547"
+    flavors["lf-highcpu-8"]="68af673f-54ee-4255-871c-158c18e4f643"
+    flavors["lf-standard-1"]="7d76cbb0-f547-4c2c-beaf-554f33832721"
+    flavors["lf-standard-2"]="ef454088-7839-42a0-bf23-5e0ab6386a27"
+    flavors["lf-standard-4"]="bd74e1e6-c2ed-475b-ab3f-2ce13936a215"
+    flavors["lf-standard-8"]="32d74024-8418-41b6-9675-b77816748148"
+    flavors["odl-highcpu-2"]="def1b86f-b7f8-4943-b430-4a0599170006"
+    flavors["odl-highcpu-4"]="0c8ec795-2ff8-4623-98cf-b4c1d92bb37c"
+    flavors["odl-highcpu-8"]="458d6499-e2c8-4580-aa88-a4a04a33ee25"
+    flavors["odl-standard-1"]="35800a3f-0c69-428d-b5cb-136d17d46c48"
+    flavors["odl-standard-2"]="8ead227a-acfe-4290-be70-fbab92e6dd2f"
+    flavors["odl-standard-4"]="f76fb18d-d5fb-4175-95c1-b29d8039d102"
+    flavors["odl-standard-8"]="ba38b1af-4f87-4e4e-860e-94e8329d0d78"
     flavors["v1-standard-1"]="bbcb7eb5-5c8d-498f-9d7e-307c575d3566"
     flavors["v1-standard-2"]="ca2a6e9c-2236-4107-8905-7ae9427132ff"
     flavors["v1-standard-4"]="5cf64088-893b-46b5-9bb1-ee020277635d"
@@ -139,25 +153,18 @@ get_minion_options() {
     flavors["v1-standard-64"]="0c1d9008-f546-4608-9e8f-f8bdaec8dddd"
     flavors["v1-standard-96"]="5741c775-92a4-4488-bd77-dd7b08e2be81"
     flavors["v1-standard-128"]="e82d0a5b-8031-4526-9a5d-a15f7b4d48ff"
-    flavors["v2-standard-1"]="52a01f6b-e660-48b5-8c06-5fb2a0fab0ec"
-    flavors["v2-standard-2"]="ac2c4d17-8d6f-4e3c-a9eb-57c155f0a949"
-    flavors["v2-standard-4"]="d9115351-defe-4fac-986b-1a1187e2c31c"
-    flavors["v2-standard-8"]="e6fe2e37-0e38-438c-8fa5-fc2d79d0a7bb"
-    flavors["v2-standard-16"]="9e4b01cd-6744-4120-aafe-1b5e17584919"
-    flavors["v2-standard-360"]="f0d27f44-a410-4f0f-9781-d722f5b5489e"
     flavors["v2-highcpu-1"]="c04abb7a-2b61-4ed3-8ce8-6c40ad9df750"
     flavors["v2-highcpu-2"]="03bdf34e-8905-46bc-a4b9-8dbf94b6e06d"
     flavors["v2-highcpu-4"]="3b72e578-7875-4e0e-91b7-71ed292f3ca2"
     flavors["v2-highcpu-8"]="221de281-95ec-414f-8e42-c86c9e0b318d"
     flavors["v2-highcpu-16"]="ddd6863a-ef4f-475c-9aee-61d46898651d"
     flavors["v2-highcpu-32"]="21dfb8a3-c472-4a2c-a8e1-4da8de415ff8"
-    flavors["odl-highcpu-2"]="def1b86f-b7f8-4943-b430-4a0599170006"
-    flavors["odl-highcpu-4"]="0c8ec795-2ff8-4623-98cf-b4c1d92bb37c"
-    flavors["odl-highcpu-8"]="458d6499-e2c8-4580-aa88-a4a04a33ee25"
-    flavors["odl-standard-1"]="35800a3f-0c69-428d-b5cb-136d17d46c48"
-    flavors["odl-standard-2"]="8ead227a-acfe-4290-be70-fbab92e6dd2f"
-    flavors["odl-standard-4"]="f76fb18d-d5fb-4175-95c1-b29d8039d102"
-    flavors["odl-standard-8"]="ba38b1af-4f87-4e4e-860e-94e8329d0d78"
+    flavors["v2-standard-1"]="52a01f6b-e660-48b5-8c06-5fb2a0fab0ec"
+    flavors["v2-standard-2"]="ac2c4d17-8d6f-4e3c-a9eb-57c155f0a949"
+    flavors["v2-standard-4"]="d9115351-defe-4fac-986b-1a1187e2c31c"
+    flavors["v2-standard-8"]="e6fe2e37-0e38-438c-8fa5-fc2d79d0a7bb"
+    flavors["v2-standard-16"]="9e4b01cd-6744-4120-aafe-1b5e17584919"
+    flavors["v2-standard-360"]="f0d27f44-a410-4f0f-9781-d722f5b5489e"
 
     image_name=$(get_cfg "$cfg_file" IMAGE_NAME "")
     volume_size=$(get_cfg "$cfg_file" VOLUME_SIZE "")