From b1b71ac7132ff5ccebcfac8ca2bb2f7540025b13 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Mon, 8 Jan 2018 17:17:17 +0800 Subject: deploy kubernetes in XCI This commit introduces kubespray into XCI. k8s install currently assumes k8s install and OpenStack install cannot coexist. If XCI_INSTALLER is set to "kubespray" and DEPLOY_SCENARIO is set to "k8-nosdn-nofeature" the xci-deploy.sh would install kubernetes instead of OpenStack. The version of kubernetes is beta release v1.9.0 currently according to the master of kubespray it only support the ubuntu now. Opensuse and centos still need to develop and test. This patch create the directory xci/installer/kubespray, the related files of kubespray would be placed to it. The xci/installer/$installer/playbooks/configure-localhost.yml was moved to xci/playbooks/configure-localhost.yml as a common yaml file. You can modify some parameters according your need in xci/installer/kubespray/files/k8s-cluster.yml to deploy cluster. When deploying kubernetes, it would download the kubespray to releng-xci/.cache/repos/kubespray. If your flavor is Ha, it will download haproxy_server and keepalived to xci/playbook/roles, which setup haproxy service for kubernetes. Change-Id: I24d521a735d7ee85fbe5af8c4def65f37586b843 Signed-off-by: wutianwei --- xci/config/user-vars | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'xci/config/user-vars') 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} #------------------------------------------------------------------------------- -- cgit 1.2.3-korg