From 3d4ac3786772ec23791183b4c54a9d6fd922752e Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 4 May 2018 23:11:35 +0200 Subject: Use PDF to set up the XCI VMs This patch is doing the first work item of the spec: https://github.com/opnfv/releng-xci/blob/master/docs/specs/infra_manager.rst It creates the required VMs by XCI to afterwards deploy the VIM. It does that by reading the pdf provided by the user. - It is currently assumed that the OS for the VM will be installed in the first disk of the node described by the pdf - It is assumed that the opnfv VM characteristics are not described in the pdf but in a similar document called opnfv_vm.yml - All references to csv from bifrost-create-vm-nodes were removed Change-Id: I46a85284e4ce7df21cbf66f66619b35f74251e68 Signed-off-by: Manuel Buil Co-Authored-by: Markos Chandras --- xci/config/ha-vars | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xci/config/ha-vars') 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} -- cgit 1.2.3-korg