summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-07-04 06:33:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-04 06:33:23 +0000
commit82ff11255525f67e726a26616e45845bc49fbb23 (patch)
tree7ec623e6a908190e8cefce0509bf9ec5fe8265bc
parent3d4ac3786772ec23791183b4c54a9d6fd922752e (diff)
parentd0fa134ee87de3f69c86dadd2d0c11a07570b9d6 (diff)
Merge "Disable the flavor aio and set default flavor to mini"
-rwxr-xr-xxci/config/user-vars2
-rw-r--r--xci/opnfv-scenario-requirements.yml5
2 files changed, 1 insertions, 6 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars
index 1554777d..1f30ec38 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -20,7 +20,7 @@
# or
# export XCI_FLAVOR="ha"
#-------------------------------------------------------------------------------
-export XCI_FLAVOR=${XCI_FLAVOR:-aio}
+export XCI_FLAVOR=${XCI_FLAVOR:-mini}
export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})}
export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false}
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index 8688d3cc..a43127b5 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -84,7 +84,6 @@
installers:
- installer: kubespray
flavors:
- - aio
- ha
- mini
- noha
@@ -101,7 +100,6 @@
installers:
- installer: kubespray
flavors:
- - aio
- ha
- mini
- noha
@@ -118,7 +116,6 @@
installers:
- installer: kubespray
flavors:
- - aio
- ha
- mini
- noha
@@ -135,7 +132,6 @@
installers:
- installer: kubespray
flavors:
- - aio
- ha
- noha
- mini
@@ -152,7 +148,6 @@
installers:
- installer: kubespray
flavors:
- - aio
- ha
- noha
- mini