3 files changed, 21 insertions, 0 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index c7744ca1..f188149f 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -7,6 +7,9 @@ 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_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
 export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
+export KUBESPRAY_GIT_URL=https://github.com/kubernetes-incubator/kubespray.git
+export OPENSTACK_OSA_HAPROXY_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-haproxy_server
+export KEEPALIVED_GIT_URL=https://github.com/evrardjp/ansible-keepalived
 export OPNFV_HOST_IP=192.168.122.2
 export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$XCI_INSTALLER/files/$XCI_FLAVOR
 export CI_LOOP=${CI_LOOP:-daily}
@@ -34,3 +37,5 @@ export ANSIBLE_HOST_KEY_CHECKING=False
 # subject of the certificate
 export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"}
 export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"}
+# Kubespray requires that ansible version is 2.4.0.0
+export XCI_KUBE_ANSIBLE_PIP_VERSION=2.4.0.0
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index 023c9999..89b03df1 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -29,3 +29,10 @@ export OPNFV_RELENG_VERSION="master"
 export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"8b4c956bf0ec6c1784e41af2a0598cb49c41461f"}
 # HEAD of osa "master" as of 11.12.2017
 export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"7b3aac28a0a87e5966527829f6b0abcbc2303cc7"}
+export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
+       ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
+       | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')
+export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \
+       ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
+       | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')
+export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"master"}
diff --git a/xci/config/user-vars b/xci/config/user-vars
index 64f2882b..49124233 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -23,6 +23,15 @@
 export XCI_FLAVOR=${XCI_FLAVOR:-aio}
 export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})}
 export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false}
+
+#-------------------------------------------------------------------------------
+# Set INSTALLER
+#-------------------------------------------------------------------------------
+# Currently, there are two kinds of installers in XCI: osa and kubespray
+# Examples:
+#    export XCI_INSTALLER="osa"
+# or
+#    export XCI_INSTALLER="kubespray"
 export XCI_INSTALLER=${XCI_INSTALLER:-osa}
 
 #-------------------------------------------------------------------------------