diff options
Diffstat (limited to 'prototypes/xci')
-rwxr-xr-x[-rw-r--r--] | prototypes/xci/config/aio-vars (renamed from prototypes/xci/flavors/aio) | 2 | ||||
-rwxr-xr-x | prototypes/xci/config/env-vars | 13 | ||||
-rwxr-xr-x[-rw-r--r--] | prototypes/xci/config/ha-vars (renamed from prototypes/xci/flavors/ha) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | prototypes/xci/config/mini-vars (renamed from prototypes/xci/flavors/mini) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | prototypes/xci/config/noha-vars (renamed from prototypes/xci/flavors/noha) | 4 | ||||
-rwxr-xr-x | prototypes/xci/config/pinned-versions | 11 | ||||
-rwxr-xr-x | prototypes/xci/config/user-vars | 18 | ||||
-rw-r--r-- | prototypes/xci/file/aio/flavor-vars.yml (renamed from prototypes/xci/file/aio/playbooks/configure-xcihost.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/aio/inventory (renamed from prototypes/xci/file/ha/playbooks/inventory) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/aio/openstack_user_config.yml (renamed from prototypes/xci/file/ha/configure-targethosts.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/aio/playbooks/inventory | 2 | ||||
-rw-r--r-- | prototypes/xci/file/aio/var/ubuntu.yml | 7 | ||||
-rw-r--r-- | prototypes/xci/file/cinder.yml (renamed from prototypes/xci/file/ha/playbooks/configure-xcihost.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/exports (renamed from prototypes/xci/file/ha/var/ubuntu.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/ha/flavor-vars.yml (renamed from prototypes/xci/file/mini/configure-targethosts.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/ha/inventory (renamed from prototypes/xci/file/mini/playbooks/inventory) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/ha/openstack_user_config.yml (renamed from prototypes/xci/file/mini/playbooks/configure-xcihost.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/mini/flavor-vars.yml (renamed from prototypes/xci/file/mini/var/ubuntu.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/mini/inventory (renamed from prototypes/xci/file/noha/playbooks/inventory) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/mini/openstack_user_config.yml (renamed from prototypes/xci/file/noha/configure-targethosts.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/modules (renamed from prototypes/xci/file/noha/playbooks/configure-xcihost.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/noha/flavor-vars.yml (renamed from prototypes/xci/file/noha/var/ubuntu.yml) | 0 | ||||
-rw-r--r-- | prototypes/xci/file/noha/inventory | 0 | ||||
-rw-r--r-- | prototypes/xci/file/noha/openstack_user_config.yml | 0 | ||||
-rw-r--r-- | prototypes/xci/file/setup-openstack.yml | 0 | ||||
-rw-r--r-- | prototypes/xci/file/user_variables.yml | 0 | ||||
-rw-r--r-- | prototypes/xci/playbooks/configure-localhost.yml | 0 | ||||
-rw-r--r-- | prototypes/xci/playbooks/inventory | 0 | ||||
-rw-r--r-- | prototypes/xci/template/compute.interface.j2 | 0 | ||||
-rw-r--r-- | prototypes/xci/template/controller.interface.j2 | 0 | ||||
-rw-r--r-- | prototypes/xci/template/opnfv.interface.j2 | 0 | ||||
-rw-r--r-- | prototypes/xci/var/ubuntu.yml | 0 | ||||
-rwxr-xr-x | prototypes/xci/xci-deploy.sh | 8 |
33 files changed, 39 insertions, 32 deletions
diff --git a/prototypes/xci/flavors/aio b/prototypes/xci/config/aio-vars index 48754e507..f28ecff1b 100644..100755 --- a/prototypes/xci/flavors/aio +++ 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 106a17930..1bb553b60 100755 --- a/prototypes/xci/config/env-vars +++ b/prototypes/xci/config/env-vars @@ -1,12 +1,17 @@ #------------------------------------------------------------------------------- -# Do not change these settings if you are not developing for XCI Sandbox! +# !!! Changing or overriding these will most likely break everything altogether !!! +# Please do not change these settings if you are not developing for XCI! #------------------------------------------------------------------------------- export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng.git 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 XCI_ANSIBLE_PLAYBOOKS_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR/playbooks -export XCI_ANSIBLE_VARS_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR/var +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 +export DISTRO=${DISTRO:-ubuntu} +export DIB_OS_RELEASE=${DIB_OS_RELEASE:-xenial} +export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal} +export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables"} diff --git a/prototypes/xci/flavors/ha b/prototypes/xci/config/ha-vars index 8a045a3dd..1ba45890b 100644..100755 --- a/prototypes/xci/flavors/ha +++ 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/flavors/mini b/prototypes/xci/config/mini-vars index 44b015d9f..8f1e83cd8 100644..100755 --- a/prototypes/xci/flavors/mini +++ b/prototypes/xci/config/mini-vars @@ -10,9 +10,9 @@ # 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 -export VM_MEMORY_SIZE=8192 +export VM_MEMORY_SIZE=12288 export VM_DISK_CACHE=unsafe diff --git a/prototypes/xci/flavors/noha b/prototypes/xci/config/noha-vars index 7f686e5e5..935becb27 100644..100755 --- a/prototypes/xci/flavors/noha +++ b/prototypes/xci/config/noha-vars @@ -10,9 +10,9 @@ # 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 -export VM_MEMORY_SIZE=8192 +export VM_MEMORY_SIZE=12288 export VM_DISK_CACHE=unsafe diff --git a/prototypes/xci/config/pinned-versions b/prototypes/xci/config/pinned-versions index 2fe9eee42..1cd33813c 100755 --- a/prototypes/xci/config/pinned-versions +++ b/prototypes/xci/config/pinned-versions @@ -3,7 +3,8 @@ #------------------------------------------------------------------------------- # You are free to override these versions in user-vars to experiment with # different branches or with different commits but be aware that things might -# not work as expected. +# not work as expected. You can set the versions you want to use before running +# the main script on your shell as shown on the examples below. # # It is important to be consistent between branches you use for OpenStack # projects OPNFV XCI uses. @@ -20,7 +21,7 @@ #------------------------------------------------------------------------------- # use releng from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" -# HEAD of "master" as of 27.03.2017 - verified by OPNFV CI -export OPENSTACK_BIFROST_VERSION="7417ff36e4b5fc4e2a6ee7d9dddb7287be20c37d" -# HEAD of "master" as of 27.03.2017 - verified by OPNFV CI -export OPENSTACK_OSA_VERSION="baba7b317a5898cd73b4a11c4ce364c7e2d3d77f" +# HEAD of "master" as of 28.03.2017 +export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"2600d546ed7116f5aad81972b0987a269f3c45b4"} +# HEAD of "master" as of 26.03.2017 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"baba7b317a5898cd73b4a11c4ce364c7e2d3d77f"} diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars index f29dda66f..d910405a7 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 @@ -33,6 +33,14 @@ export OPENSTACK_BIFROST_PATH=/opt/bifrost export OPENSTACK_OSA_PATH=/opt/openstack-ansible #------------------------------------------------------------------------------- +# Set the playbook to use for OpenStack deployment +#------------------------------------------------------------------------------- +# The variable can be overriden in order to install additional OpenStack services +# supported by OpenStack Ansible or exclude certain OpenStack services. +#------------------------------------------------------------------------------- +export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/setup-openstack.yml"} + +#------------------------------------------------------------------------------- # Configure some other stuff #------------------------------------------------------------------------------- # Set the verbosity for ansible @@ -42,3 +50,5 @@ export OPENSTACK_OSA_PATH=/opt/openstack-ansible # or # ANSIBLE_VERBOSITY="-vvvv" export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""} +export LOG_PATH=${LOG_PATH:-/opt/opnfv/logs} +export RUN_TEMPEST=${RUN_TEMPEST:-false} diff --git a/prototypes/xci/file/aio/playbooks/configure-xcihost.yml b/prototypes/xci/file/aio/flavor-vars.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/aio/playbooks/configure-xcihost.yml +++ b/prototypes/xci/file/aio/flavor-vars.yml diff --git a/prototypes/xci/file/ha/playbooks/inventory b/prototypes/xci/file/aio/inventory index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/ha/playbooks/inventory +++ b/prototypes/xci/file/aio/inventory diff --git a/prototypes/xci/file/ha/configure-targethosts.yml b/prototypes/xci/file/aio/openstack_user_config.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/ha/configure-targethosts.yml +++ b/prototypes/xci/file/aio/openstack_user_config.yml diff --git a/prototypes/xci/file/aio/playbooks/inventory b/prototypes/xci/file/aio/playbooks/inventory deleted file mode 100644 index 9283e516d..000000000 --- a/prototypes/xci/file/aio/playbooks/inventory +++ /dev/null @@ -1,2 +0,0 @@ -[xciaio] -xciaio ansible_ssh_host=192.168.122.2 diff --git a/prototypes/xci/file/aio/var/ubuntu.yml b/prototypes/xci/file/aio/var/ubuntu.yml deleted file mode 100644 index 3a041b1cb..000000000 --- a/prototypes/xci/file/aio/var/ubuntu.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -OPENSTACK_OSA_GIT_URL: "{{ lookup('env','OPENSTACK_OSA_GIT_URL') }}" -OPENSTACK_OSA_PATH: "{{ lookup('env','OPENSTACK_OSA_PATH') }}" -OPENSTACK_OSA_VERSION: "{{ lookup('env','OPENSTACK_OSA_VERSION') }}" -OPENSTACK_OSA_ETC_PATH: "{{ lookup('env','OPENSTACK_OSA_ETC_PATH') }}" -XCI_IP: "{{ lookup('env','XCI_IP') }}" -multi_host: "False" diff --git a/prototypes/xci/file/ha/playbooks/configure-xcihost.yml b/prototypes/xci/file/cinder.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/ha/playbooks/configure-xcihost.yml +++ b/prototypes/xci/file/cinder.yml diff --git a/prototypes/xci/file/ha/var/ubuntu.yml b/prototypes/xci/file/exports index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/ha/var/ubuntu.yml +++ b/prototypes/xci/file/exports diff --git a/prototypes/xci/file/mini/configure-targethosts.yml b/prototypes/xci/file/ha/flavor-vars.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/mini/configure-targethosts.yml +++ b/prototypes/xci/file/ha/flavor-vars.yml diff --git a/prototypes/xci/file/mini/playbooks/inventory b/prototypes/xci/file/ha/inventory index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/mini/playbooks/inventory +++ b/prototypes/xci/file/ha/inventory diff --git a/prototypes/xci/file/mini/playbooks/configure-xcihost.yml b/prototypes/xci/file/ha/openstack_user_config.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/mini/playbooks/configure-xcihost.yml +++ b/prototypes/xci/file/ha/openstack_user_config.yml diff --git a/prototypes/xci/file/mini/var/ubuntu.yml b/prototypes/xci/file/mini/flavor-vars.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/mini/var/ubuntu.yml +++ b/prototypes/xci/file/mini/flavor-vars.yml diff --git a/prototypes/xci/file/noha/playbooks/inventory b/prototypes/xci/file/mini/inventory index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/noha/playbooks/inventory +++ b/prototypes/xci/file/mini/inventory diff --git a/prototypes/xci/file/noha/configure-targethosts.yml b/prototypes/xci/file/mini/openstack_user_config.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/noha/configure-targethosts.yml +++ b/prototypes/xci/file/mini/openstack_user_config.yml diff --git a/prototypes/xci/file/noha/playbooks/configure-xcihost.yml b/prototypes/xci/file/modules index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/noha/playbooks/configure-xcihost.yml +++ b/prototypes/xci/file/modules diff --git a/prototypes/xci/file/noha/var/ubuntu.yml b/prototypes/xci/file/noha/flavor-vars.yml index e69de29bb..e69de29bb 100644 --- a/prototypes/xci/file/noha/var/ubuntu.yml +++ b/prototypes/xci/file/noha/flavor-vars.yml diff --git a/prototypes/xci/file/noha/inventory b/prototypes/xci/file/noha/inventory new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/file/noha/inventory diff --git a/prototypes/xci/file/noha/openstack_user_config.yml b/prototypes/xci/file/noha/openstack_user_config.yml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/file/noha/openstack_user_config.yml diff --git a/prototypes/xci/file/setup-openstack.yml b/prototypes/xci/file/setup-openstack.yml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/file/setup-openstack.yml diff --git a/prototypes/xci/file/user_variables.yml b/prototypes/xci/file/user_variables.yml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/file/user_variables.yml diff --git a/prototypes/xci/playbooks/configure-localhost.yml b/prototypes/xci/playbooks/configure-localhost.yml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/playbooks/configure-localhost.yml diff --git a/prototypes/xci/playbooks/inventory b/prototypes/xci/playbooks/inventory new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/playbooks/inventory diff --git a/prototypes/xci/template/compute.interface.j2 b/prototypes/xci/template/compute.interface.j2 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/template/compute.interface.j2 diff --git a/prototypes/xci/template/controller.interface.j2 b/prototypes/xci/template/controller.interface.j2 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/template/controller.interface.j2 diff --git a/prototypes/xci/template/opnfv.interface.j2 b/prototypes/xci/template/opnfv.interface.j2 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/template/opnfv.interface.j2 diff --git a/prototypes/xci/var/ubuntu.yml b/prototypes/xci/var/ubuntu.yml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/prototypes/xci/var/ubuntu.yml diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh index 401c098c6..326d659d4 100755 --- a/prototypes/xci/xci-deploy.sh +++ b/prototypes/xci/xci-deploy.sh @@ -13,14 +13,14 @@ 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 +source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars" # source xci configuration source $XCI_PATH/config/env-vars |