diff options
| -rwxr-xr-x | prototypes/xci/config/aio-vars | 2 | ||||
| -rwxr-xr-x | prototypes/xci/config/env-vars | 2 | ||||
| -rwxr-xr-x | prototypes/xci/config/ha-vars | 2 | ||||
| -rwxr-xr-x | prototypes/xci/config/mini-vars | 2 | ||||
| -rwxr-xr-x | prototypes/xci/config/noha-vars | 2 | ||||
| -rwxr-xr-x | prototypes/xci/config/user-vars | 10 | ||||
| -rw-r--r-- | prototypes/xci/template/opnfv.interface.j2 (renamed from prototypes/xci/template/xci.interface.j2) | 0 | ||||
| -rwxr-xr-x | prototypes/xci/xci-deploy.sh | 6 |
8 files changed, 13 insertions, 13 deletions
diff --git a/prototypes/xci/config/aio-vars b/prototypes/xci/config/aio-vars index 48754e507..f28ecff1b 100755 --- a/prototypes/xci/config/aio-vars +++ b/prototypes/xci/config/aio-vars @@ -10,7 +10,7 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=1 -export TEST_VM_NODE_NAMES=xci +export TEST_VM_NODE_NAMES=opnfv export VM_DOMAIN_TYPE=kvm export VM_CPU=8 export VM_DISK=80 diff --git a/prototypes/xci/config/env-vars b/prototypes/xci/config/env-vars index cebf7b423..1bb553b60 100755 --- a/prototypes/xci/config/env-vars +++ b/prototypes/xci/config/env-vars @@ -7,7 +7,7 @@ export OPENSTACK_BIFROST_GIT_URL=https://git.openstack.org/openstack/bifrost export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansible export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export CLEAN_DIB_IMAGES=false -export XCI_IP=192.168.122.2 +export OPNFV_HOST_IP=192.168.122.2 export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR export JOB_NAME=${JOB_NAME:-false} export ANSIBLE_HOST_KEY_CHECKING=False diff --git a/prototypes/xci/config/ha-vars b/prototypes/xci/config/ha-vars index 8a045a3dd..1ba45890b 100755 --- a/prototypes/xci/config/ha-vars +++ b/prototypes/xci/config/ha-vars @@ -10,7 +10,7 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=6 -export TEST_VM_NODE_NAMES="xci controller00 controller01 controller02 compute00 compute01" +export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" export VM_DOMAIN_TYPE=kvm export VM_CPU=8 export VM_DISK=80 diff --git a/prototypes/xci/config/mini-vars b/prototypes/xci/config/mini-vars index 4d720801f..8f1e83cd8 100755 --- a/prototypes/xci/config/mini-vars +++ b/prototypes/xci/config/mini-vars @@ -10,7 +10,7 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=3 -export TEST_VM_NODE_NAMES="xci controller00 compute00" +export TEST_VM_NODE_NAMES="opnfv controller00 compute00" export VM_DOMAIN_TYPE=kvm export VM_CPU=8 export VM_DISK=80 diff --git a/prototypes/xci/config/noha-vars b/prototypes/xci/config/noha-vars index 22c68feeb..935becb27 100755 --- a/prototypes/xci/config/noha-vars +++ b/prototypes/xci/config/noha-vars @@ -10,7 +10,7 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=4 -export TEST_VM_NODE_NAMES="xci controller00 compute00 compute01" +export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01" export VM_DOMAIN_TYPE=kvm export VM_CPU=8 export VM_DISK=80 diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars index b326f5ce7..75ea7016b 100755 --- a/prototypes/xci/config/user-vars +++ b/prototypes/xci/config/user-vars @@ -2,10 +2,10 @@ # Set Deployment Flavor #------------------------------------------------------------------------------- # OPNFV XCI currently supports 4 different types of flavors: -# - all in one (aio): 1 xci VM which acts as controller and compute node -# - mini: 3 VMs, 1 xci VM, 1 controller, and 1 compute nodes -# - noha: 4 VMs, 1 xci VM, 1 controller, and 2 compute nodes -# - ha: 6 VMs, 1 xci VM, 3 controllers, and 2 compute nodes +# - all in one (aio): 1 opnfv VM which acts as controller and compute node +# - mini: 3 VMs, 1 opnfv VM deployment host, 1 controller, and 1 compute nodes +# - noha: 4 VMs, 1 opnfv VM deployment host, 1 controller, and 2 compute nodes +# - ha: 6 VMs, 1 opnfv VM deployment host, 3 controllers, and 2 compute nodes # # Apart from having different number of nodes, CPU, RAM, and disk allocations # also differ from each other. Please take a look at the env-vars files for @@ -42,5 +42,5 @@ export OPENSTACK_OSA_PATH=/opt/openstack-ansible # or # ANSIBLE_VERBOSITY="-vvvv" export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""} -export LOG_PATH=${LOG_PATH:-/opt/xci/logs} +export LOG_PATH=${LOG_PATH:-/opt/opnfv/logs} export RUN_TEMPEST=${RUN_TEMPEST:-false} diff --git a/prototypes/xci/template/xci.interface.j2 b/prototypes/xci/template/opnfv.interface.j2 index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/template/xci.interface.j2 +++ b/prototypes/xci/template/opnfv.interface.j2 diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh index eb1e9d78e..326d659d4 100755 --- a/prototypes/xci/xci-deploy.sh +++ b/prototypes/xci/xci-deploy.sh @@ -13,12 +13,12 @@ fi # find where are we XCI_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# source pinned versions -source $XCI_PATH/config/pinned-versions - # source user vars source $XCI_PATH/config/user-vars +# source pinned versions +source $XCI_PATH/config/pinned-versions + # source flavor configuration source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars" |