diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/aio-vars | 4 | ||||
| -rwxr-xr-x | xci/config/ha-vars | 6 | ||||
| -rwxr-xr-x | xci/config/mini-vars | 6 | ||||
| -rwxr-xr-x | xci/config/noha-vars | 6 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/xci/config/aio-vars b/xci/config/aio-vars index 1d2e4f96..cff181a9 100755 --- a/xci/config/aio-vars +++ b/xci/config/aio-vars @@ -9,8 +9,8 @@ #------------------------------------------------------------------------------- # Configure VM Nodes #------------------------------------------------------------------------------- -export TEST_VM_NUM_NODES=1 -export TEST_VM_NODE_NAMES=opnfv +export NUM_NODES=1 +export NODE_NAMES=opnfv export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-8} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/ha-vars b/xci/config/ha-vars index 131de2a7..3440a855 100755 --- a/xci/config/ha-vars +++ b/xci/config/ha-vars @@ -9,9 +9,9 @@ #------------------------------------------------------------------------------- # Configure VM Nodes #------------------------------------------------------------------------------- -export TEST_VM_NUM_NODES=6 -[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" -[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 master2 master3 node1 node2" +export NUM_NODES=6 +[[ "$INSTALLER_TYPE" == "osa" ]] && export NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export NODE_NAMES="opnfv master1 master2 master3 node1 node2" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/mini-vars b/xci/config/mini-vars index 7d2b227b..9e7e6180 100755 --- a/xci/config/mini-vars +++ b/xci/config/mini-vars @@ -9,9 +9,9 @@ #------------------------------------------------------------------------------- # Configure VM Nodes #------------------------------------------------------------------------------- -export TEST_VM_NUM_NODES=3 -[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 compute00" -[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 node1" +export NUM_NODES=3 +[[ "$INSTALLER_TYPE" == "osa" ]] && export NODE_NAMES="opnfv controller00 compute00" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export NODE_NAMES="opnfv master1 node1" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/noha-vars b/xci/config/noha-vars index 8d30a243..2f3db993 100755 --- a/xci/config/noha-vars +++ b/xci/config/noha-vars @@ -9,9 +9,9 @@ #------------------------------------------------------------------------------- # Configure VM Nodes #------------------------------------------------------------------------------- -export TEST_VM_NUM_NODES=4 -[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01" -[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 node1 node2" +export NUM_NODES=4 +[[ "$INSTALLER_TYPE" == "osa" ]] && export NODE_NAMES="opnfv controller00 compute00 compute01" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export NODE_NAMES="opnfv master1 node1 node2" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index da82c9cd..5ef0c7c2 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -28,7 +28,7 @@ export OPNFV_RELENG_VERSION="master" # use functest-healthcheck image that is known to work and contains the original list of testcases export OPNFV_FUNCTEST_HEALTHCHECK_DOCKER_IMAGE_DIGEST="sha256:faa1ec5778ac1580cc46f0e4f5abec24026868b95fc6fc3ae6023275dc980c2d" # HEAD of bifrost "master" as of 13.02.2018 -export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"28b6b8c96f89532bbddeca513285e6c00db89205"} +export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"81e48e7b488c15516503b2b08f087f4a7ae9a673"} # HEAD of ironic "master" as of 13.02.2018 export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"9b8440aa318e4883a74ef8640ad5409dd22858a9"} # HEAD of ironic-client "master" as of 13.02.2018 |