diff options
| author |   Rihab Banday <rihab.banday@ericsson.com> | 2020-09-10 18:50:45 +0200 |
|---|---|---|
| committer | Rihab Banday <rihab.banday@ericsson.com> | 2020-09-11 09:52:35 +0000 |
| commit | fa8a8f4779bbfe58c0588b4fe19a887767737f78 (patch) | |
| tree | 26a2ae41a6f29383db0ed666a5aafba434f4c707 | |
| parent | cb3895c81c6931482e688a820013f6926644221d (diff) | |
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>
| -rwxr-xr-x | functions.sh | 6 | ||||
| -rw-r--r-- | sw_config/bmra/kube-node.yml (renamed from sw_config/bmra/node1.yml) | 0 |
2 files changed, 2 insertions, 4 deletions
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 index e103673..e103673 100644 --- a/sw_config/bmra/node1.yml +++ b/sw_config/bmra/kube-node.yml |