From d17298f169d4430e78f3be0870818df0ae43ea12 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 31 Jan 2018 22:04:46 +0000 Subject: Update git submodules * Update docs/submodules/releng-xci from branch 'master' - Merge "deploy kubernetes in XCI" - 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 --- docs/submodules/releng-xci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/submodules/releng-xci b/docs/submodules/releng-xci index f3f08ae0f..0e273720d 160000 --- a/docs/submodules/releng-xci +++ b/docs/submodules/releng-xci @@ -1 +1 @@ -Subproject commit f3f08ae0fd69b26cac46351599b434c3312351bd +Subproject commit 0e273720d13a63b7f749d1cf427ff8ec38463acb -- cgit 1.2.3-korg