From 09cee3636fee20ba551e211c60f6e9942079cfb9 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sun, 24 Jun 2018 01:04:10 +0200 Subject: Integrate os-nosdn-osm scenario This change integrates os-nosdn-osm scenario. The installation of OSM is done as post-deployment. This is achieved by the addition of the new playbook named post-deployment.yml in scenario role folder. This mechanism is available for all OpenStack scenarios. If anything needs to be done for a specific scenario as part of the post-deployment, it can be achieved by creating playbook post-deployment.yml. If post-deployment.yml exists in scenario role, the framework will run it once the regular deployment playbooks are run successfully. If the file does not exist, it will be skipped. The location of the post-deployment.yml is releng-xci-scenarios//role//tasks/post-deployment.yml This is only implemented for OpenStack scenarios currently and similar mechanism is needed for K8S scenarios as well which will be implemented in a separate change. installer-type:osa deploy-scenario:os-nosdn-osm Change-Id: I16780abffca39699eb2f38f662479f0e4d551504 Signed-off-by: Fatih Degirmenci --- xci/config/env-vars | 1 + xci/config/pinned-versions | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'xci/config') 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"} -- cgit