diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-08-10 13:09:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-10 13:09:09 +0000 |
| commit | 46be526924d71cf4acc0531e7c0f052fec0bd4f9 (patch) | |
| tree | cff894b203f61b761a27a31b461d8de6e497d7e1 /xci/config | |
| parent | 4002c126504df3da4dc79ca9669546277e926889 (diff) | |
| parent | 09cee3636fee20ba551e211c60f6e9942079cfb9 (diff) | |
Merge "Integrate os-nosdn-osm scenario"
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 1 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index fe75cb80..23388829 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -11,6 +11,7 @@ export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git. export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git} export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server} export KEEPALIVED_GIT_URL=${KEEPALIVED_GIT_URL:-https://github.com/evrardjp/ansible-keepalived} +export OSM_DEVOPS_GIT_URL=${OSM_DEVOPS_GIT_URL:-https://osm.etsi.org/gerrit/osm/devops.git} # Configuration export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 5ef0c7c2..15c3c8b9 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -47,3 +47,7 @@ export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') # HEAD of kubspray "master" as of 16.05.2018 export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"38e727dbe1bdf5316fae8d645718cc8279fbda20"} +# use tagged version of OSM devops repo until the integration is done +# also, this version is not OSM version. This needs to be looked into for +# specifying exact version for OSM itself. +export OSM_DEVOPS_VERSION=${OSM_DEVOPS_VERSION:-"v4.0.1"} |