From f83fd0ccbd0949c882cbb19e7c2ee663bde70eb2 Mon Sep 17 00:00:00 2001
From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Thu, 30 May 2019 19:02:11 +0300
Subject: Make aio.sh suitable for CI

aio.sh script currently clones multicloud/k8s repo itself.
That is unnessary and makes it impossible to hook k8s repository
to CI system where commit changeset is used to define repository
files to be tested.

This commit will remove cloning of multicloud/k8s repository
and also move aio.sh to baremetal folder which seems to be
the intended place for it.

Issue-ID: MULTICLOUD-629

Change-Id: Ifc54bbc1ec06bc4c3fbbecca7e676d5ffa392d78
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
---
 kud/hosting_providers/baremetal/aio.sh | 59 +++++++++++++++++++++++++++++++++
 kud/hosting_providers/vagrant/aio.sh   | 60 ----------------------------------
 2 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100755 kud/hosting_providers/baremetal/aio.sh
 delete mode 100755 kud/hosting_providers/vagrant/aio.sh

(limited to 'kud')

diff --git a/kud/hosting_providers/baremetal/aio.sh b/kud/hosting_providers/baremetal/aio.sh
new file mode 100755
index 00000000..5b448183
--- /dev/null
+++ b/kud/hosting_providers/baremetal/aio.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [[ $(whoami) != 'root' ]];then
+    echo "This bash script must be executed as root user"
+    exit 1
+fi
+
+aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+cd ${aio_dir}/../vagrant
+
+cat <<EOL > inventory/hosts.ini
+[all]
+localhost
+
+[kube-master]
+localhost
+
+[kube-node]
+localhost
+
+[etcd]
+localhost
+
+[ovn-central]
+localhost
+
+[ovn-controller]
+localhost
+
+[virtlet]
+localhost
+
+[k8s-cluster:children]
+kube-node
+kube-master
+EOL
+
+rm -f ~/.ssh/id_rsa
+echo -e "\n\n\n" | ssh-keygen -t rsa -N ""
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+chmod og-wx ~/.ssh/authorized_keys
+
+echo "Enabling nested-virtualization"
+./node.sh
+
+echo "Deploying KUD project"
+./installer.sh | tee kud_installer.log
diff --git a/kud/hosting_providers/vagrant/aio.sh b/kud/hosting_providers/vagrant/aio.sh
deleted file mode 100755
index 0d06cc65..00000000
--- a/kud/hosting_providers/vagrant/aio.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-if [[ $(whoami) != 'root' ]];then
-    echo "This bash script must be executed as root user"
-    exit 1
-fi
-
-echo "Cloning and configuring KUD project..."
-rm -rf k8s
-git clone https://git.onap.org/multicloud/k8s/
-cd k8s/kud/hosting_providers/baremetal/
-cat <<EOL > inventory/hosts.ini
-[all]
-localhost
-
-[kube-master]
-localhost
-
-[kube-node]
-localhost
-
-[etcd]
-localhost
-
-[ovn-central]
-localhost
-
-[ovn-controller]
-localhost
-
-[virtlet]
-localhost
-
-[k8s-cluster:children]
-kube-node
-kube-master
-EOL
-sed -i '/andrewrothstein.kubectl/d' ../../deployment_infra/playbooks/configure-*.yml
-rm -f ~/.ssh/id_rsa
-echo -e "\n\n\n" | ssh-keygen -t rsa -N ""
-cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-chmod og-wx ~/.ssh/authorized_keys
-
-echo "Enabling nested-virtualization"
-./node.sh
-
-echo "Deploying KRD project"
-./installer.sh | tee kud_installer.log
-- 
cgit 1.2.3-korg