summaryrefslogtreecommitdiffstats
path: root/xci/files
diff options
context:
space:
mode:
authornikoskarandreas <nick@intracom-telecom.com>2019-02-22 13:04:29 +0200
committernikoskarandreas <nick@intracom-telecom.com>2019-08-01 07:13:40 -0400
commit0d6907e04a51aface7ed6cd456f4e20f2d2ad0e2 (patch)
treea3ee23be9aee9cea0032b1df89de01ee486b8728 /xci/files
parent3bfb68f11c8f2579a0daff825fb54c64641a26b0 (diff)
Introduction of Openstack-helm as installer
This patch creates a new installer tree in xci that uses openstack-helm to deploy openstack on a kubernetes cluster. USAGE: Export INSTALLER_TYPE=osh, DEPLOY_SCENARIO=k8-calico-nofeature and XCI_FLAVOR=noha or mini and run xci-deploy.sh as in documentation. deploy-scenario:k8-calico-nofeature installer-type:osh Change-Id: I212f70eb51c2a38c798c11367d2ebb8bf5f4a1de Signed-off-by: nikoskarandreas <nick@intracom-telecom.com>
Diffstat (limited to 'xci/files')
-rw-r--r--xci/files/xci-lib.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/xci/files/xci-lib.sh b/xci/files/xci-lib.sh
index ef7697f6..d1e76f59 100644
--- a/xci/files/xci-lib.sh
+++ b/xci/files/xci-lib.sh
@@ -197,7 +197,7 @@ function install_ansible() {
ansible_lint() {
set -eu
- local playbooks_dir=(xci/playbooks xci/installer/osa/playbooks xci/installer/kubespray/playbooks)
+ local playbooks_dir=(xci/playbooks xci/installer/osa/playbooks xci/installer/kubespray/playbooks xci/installer/osh/playbooks)
# Extract role from scenario information
local testing_role=$(sed -n "/^- scenario: ${DEPLOY_SCENARIO}$/,/^$/p" ${XCI_PATH}/xci/opnfv-scenario-requirements.yml | grep role | rev | cut -d '/' -f -1 | rev)
@@ -293,6 +293,7 @@ log_xci_information() {
[[ "$INFRA_DEPLOYMENT" == "bifrost" ]] && echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
[[ "$INSTALLER_TYPE" == "osa" ]] && echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
[[ "$INSTALLER_TYPE" == "kubespray" ]] && echo "kubespray version: $KUBESPRAY_VERSION"
+ [[ "$INSTALLER_TYPE" == "osh" ]] && echo "kubespray version: $KUBESPRAY_VERSION"
echo "-------------------------------------------------------------------------"
}