diff options
| author |   Michael S. Pedersen <michaelx.pedersen@intel.com> | 2021-02-16 08:23:52 +0000 |
|---|---|---|
| committer |   Rihab Banday <rihab.banday@ericsson.com> | 2021-02-18 16:21:03 +0000 |
| commit | 6e8671fba4bd1d29836695760b5b219ef0123e2e (patch) | |
| tree | cc89382bfa4aca618b6c54b72cbaf64c8e1ea722 /functions.sh | |
| parent | fb568935ed1aab1d2cd03307e09c8494c1621e73 (diff) | |
Update BMRA to v2.1
Updated Kuberef to use BMRA v2.1 instead of v2.0.
Removed a few workarounds used for BMRA v2.0.
Updated a few dependencies in deployment container.
Updated Kuberef templates for BMRA configuration.
Signed-off-by: Michael S. Pedersen <michaelx.pedersen@intel.com>
Change-Id: I091da09277ca9ecc0d3d7574dc3c4f000e73432d
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72064
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Rihab Banday <rihab.banday@ericsson.com>
Diffstat (limited to 'functions.sh')
| -rwxr-xr-x | functions.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/functions.sh b/functions.sh index cb099d5..03e2284 100755 --- a/functions.sh +++ b/functions.sh @@ -194,7 +194,7 @@ provision_k8s() { ansible_cmd="/bin/bash -c '" if [[ "$DEPLOYMENT" == "k8s" ]]; then ansible-playbook -i "$CURRENTPATH"/sw_config/bmra/inventory.ini "$CURRENTPATH"/playbooks/pre-install.yaml - ansible_cmd+="pip install --upgrade pip==9.0.3; pip install ansible==2.9.6; ansible-playbook -i /bmra/inventory.ini /bmra/playbooks/k8s/patch_kubespray.yml;" + ansible_cmd+="yum -y remove python-netaddr; pip install --upgrade pip; pip install ansible==2.9.6; ansible-playbook -i /bmra/inventory.ini /bmra/playbooks/k8s/patch_kubespray.yml;" fi ansible_cmd+="ansible-playbook -i /bmra/inventory.ini /bmra/playbooks/${BMRA_PROFILE}.yml'" @@ -210,7 +210,7 @@ if ! command -v docker; then done fi if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then - git clone --recurse-submodules --depth 1 https://github.com/intel/container-experience-kits.git -b v2.0.0 ${PROJECT_ROOT}/container-experience-kits/ + git clone --recurse-submodules --depth 1 https://github.com/intel/container-experience-kits.git -b v2.1.0 ${PROJECT_ROOT}/container-experience-kits/ cp -r ${PROJECT_ROOT}/container-experience-kits/examples/${BMRA_PROFILE}/group_vars ${PROJECT_ROOT}/container-experience-kits/ # NOTE The following condition/workaround will be removed once the reported issue https://github.com/intel/container-experience-kits/issues/68 # is fixed upstream @@ -225,12 +225,6 @@ cp ${PROJECT_ROOT}/${INSTALLER}/inventory.ini \ ${PROJECT_ROOT}/container-experience-kits/ cp ${PROJECT_ROOT}/${INSTALLER}/{all.yml,kube-node.yml} \ ${PROJECT_ROOT}/container-experience-kits/group_vars/ -cp ${PROJECT_ROOT}/${INSTALLER}/dpdk_patch.yml \ - ${PROJECT_ROOT}/container-experience-kits/roles/install_dpdk/tasks/main.yml -cp ${PROJECT_ROOT}/${INSTALLER}/patched_tas.yml \ - ${PROJECT_ROOT}/container-experience-kits/roles/tas_install/tasks/tas.yml -cp ${PROJECT_ROOT}/${INSTALLER}/patched_cmk.yml \ - ${PROJECT_ROOT}/container-experience-kits/roles/cmk_install/charts/cpu-manager-for-kubernetes/templates/job.yml cp ${PROJECT_ROOT}/${INSTALLER}/patched_cmk_build.yml \ ${PROJECT_ROOT}/container-experience-kits/roles/cmk_install/tasks/main.yml sudo docker run --rm \ |