From: Rihab Banday <rihab.banday@ericsson.com>
Date: Thu, 10 Sep 2020 16:50:45 +0000 (+0200)
Subject: Replace worker node specific config file by a common file
X-Git-Tag: opnfv-10.0.0~15
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kuberef.git;a=commitdiff_plain;h=fa8a8f4779bbfe58c0588b4fe19a887767737f78

Replace worker node specific config file by a common file

This change replaces the BMRA node1.yml file by a common config
file under group_vars which includes overrides for all the
worker nodes in a cluster.

Change-Id: I305fd227ba0032f80cbf1daa9019fdfd881baa30
Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71074
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Michael Pedersen <michael.soelvkaer@gmail.com>
Reviewed-by: Georg Kunz <georg.kunz@est.tech>
---

diff --git a/functions.sh b/functions.sh
index 1229d32..a4753e1 100755
--- a/functions.sh
+++ b/functions.sh
@@ -164,17 +164,15 @@ if ! command -v docker; then
 fi
 if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then
     git clone --recurse-submodules --depth 1 https://github.com/intel/container-experience-kits.git -b v1.4.1 ${PROJECT_ROOT}/container-experience-kits/
-    cp -r ${PROJECT_ROOT}/container-experience-kits/examples/{group_vars,host_vars} ${PROJECT_ROOT}/container-experience-kits/
+    cp -r ${PROJECT_ROOT}/container-experience-kits/examples/group_vars ${PROJECT_ROOT}/container-experience-kits/
 #TODO Remove this once the reported issue is fixed in the next BMRA Release
     sed -i '/\openshift/a \    extra_args: --ignore-installed PyYAML' \
          ${PROJECT_ROOT}/container-experience-kits/roles/net-attach-defs-create/tasks/main.yml
 fi
 cp ${PROJECT_ROOT}/${INSTALLER}/inventory.ini \
     ${PROJECT_ROOT}/container-experience-kits/
-cp ${PROJECT_ROOT}/${INSTALLER}/all.yml \
+cp ${PROJECT_ROOT}/${INSTALLER}/{all.yml,kube-node.yml} \
     ${PROJECT_ROOT}/container-experience-kits/group_vars/
-cp ${PROJECT_ROOT}/${INSTALLER}/node1.yml \
-    ${PROJECT_ROOT}/container-experience-kits/host_vars/
 sudo docker run --rm \
 -v ${PROJECT_ROOT}/container-experience-kits:/bmra \
 -v ~/.ssh/:/root/.ssh/ rihabbanday/bmra-install:centos \
diff --git a/sw_config/bmra/node1.yml b/sw_config/bmra/kube-node.yml
similarity index 100%
rename from sw_config/bmra/node1.yml
rename to sw_config/bmra/kube-node.yml