diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 12 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 8 | ||||
| -rwxr-xr-x | xci/config/user-vars | 40 |
3 files changed, 36 insertions, 24 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars new file mode 100755 index 00000000..106a1793 --- /dev/null +++ b/xci/config/env-vars @@ -0,0 +1,12 @@ +#------------------------------------------------------------------------------- +# Do not change these settings if you are not developing for XCI Sandbox! +#------------------------------------------------------------------------------- +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 JOB_NAME=${JOB_NAME:-false} diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index c81fcc36..2fe9eee4 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -20,7 +20,7 @@ #------------------------------------------------------------------------------- # use releng from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" -# HEAD of "stable/ocata" as of 24.03.2017 - verified by OPNFV CI -export OPENSTACK_BIFROST_VERSION="a87f7ce6c8725b3bbffec7b2efa1e466796848a9" -# HEAD of "stable/ocata" as of 24.03.2017 - verified by OPNFV CI -export OPENSTACK_OSA_VERSION="4713cf45e11b4ebca9fbed25d1389854602213d8" +# 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" diff --git a/xci/config/user-vars b/xci/config/user-vars index bb2bfe1d..f29dda66 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -1,36 +1,36 @@ #------------------------------------------------------------------------------- -# Set Paths to where git repositories of XCI Components will be cloned -#------------------------------------------------------------------------------- -# OPNFV XCI Sandbox is not verified to be used as non-root user as of yet so -# changing these paths might break things. -#------------------------------------------------------------------------------- -export OPNFV_RELENG_PATH=/opt/releng -export OPENSTACK_BIFROST_PATH=/opt/bifrost -export OPENSTACK_OSA_PATH=/opt/openstack-ansible - -#------------------------------------------------------------------------------- # Set Deployment Flavor #------------------------------------------------------------------------------- # OPNFV XCI currently supports 4 different types of flavors: -# - all in one (aio) - xci-aio.sh: 1 VM which acts as controller and compute node -# - mini opnfv: 3 VMs, 1 xcimaster, 1 controller, and 1 compute nodes -# - noha: 4 VMs, 1 xcimaster, 1 controller, and 2 compute nodes -# - ha: 6 VMs, 1 xcimaster, 3 controllers, and 2 compute nodes +# - 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 # # 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 # each of these flavors. # # Examples: -# export XCI_FLAVOR="xci-aio" +# export XCI_FLAVOR="aio" # or -# export XCI_FLAVOR="xci-mini" +# export XCI_FLAVOR="mini" # or -# export XCI_FLAVOR="xci-noha" +# export XCI_FLAVOR="noha" # or -# export XCI_FLAVOR="xci-ha" +# export XCI_FLAVOR="ha" #------------------------------------------------------------------------------- -export XCI_FLAVOR=${XCI_FLAVOR:-xci-mini} +export XCI_FLAVOR=${XCI_FLAVOR:-aio} + +#------------------------------------------------------------------------------- +# Set Paths to where git repositories of XCI Components will be cloned +#------------------------------------------------------------------------------- +# OPNFV XCI Sandbox is not verified to be used as non-root user as of yet so +# changing these paths might break things. +#------------------------------------------------------------------------------- +export OPNFV_RELENG_PATH=/opt/releng +export OPENSTACK_BIFROST_PATH=/opt/bifrost +export OPENSTACK_OSA_PATH=/opt/openstack-ansible #------------------------------------------------------------------------------- # Configure some other stuff @@ -41,4 +41,4 @@ export XCI_FLAVOR=${XCI_FLAVOR:-xci-mini} # ANSIBLE_VERBOSITY="-v" # or # ANSIBLE_VERBOSITY="-vvvv" -export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY:-""} +export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""} |