diff options
| author |   Michael S. Pedersen <michaelx.pedersen@intel.com> | 2021-04-23 10:04:20 +0000 |
|---|---|---|
| committer | Michael Pedersen <michaelx.pedersen@intel.com> | 2021-04-28 15:02:43 +0000 |
| commit | 92ff19c63d31deb2612800828ab09e5749e12476 (patch) | |
| tree | 336f8e31ec2bf5df30a9c824830b92f10dd977f4 /functions.sh | |
| parent | 76dcc74bc4094159091e7ed68b2376342d658001 (diff) | |
Update BMRA to v21.03
Update Kuberef to use most recent release of BMRA.
Also updates configuration with minor changes and additions.
Signed-off-by: Michael S. Pedersen <michaelx.pedersen@intel.com>
Change-Id: Ifc4ef114564a2085000c23347390089227c0ebd9
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72429
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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/functions.sh b/functions.sh index fce71f6..1a07ec0 100755 --- a/functions.sh +++ b/functions.sh @@ -210,7 +210,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+="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;" + ansible_cmd+="yum -y remove python-netaddr; pip install --upgrade pip; pip install ansible==2.9.17; 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'" @@ -226,7 +226,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.1.0 ${PROJECT_ROOT}/container-experience-kits/ + git clone --recurse-submodules --depth 1 https://github.com/intel/container-experience-kits.git -b v21.03 ${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 @@ -245,6 +245,11 @@ cp ${PROJECT_ROOT}/${INSTALLER}/patched_cmk_build.yml \ ${PROJECT_ROOT}/container-experience-kits/roles/cmk_install/tasks/main.yml cp ${PROJECT_ROOT}/${INSTALLER}/patched_vfio.yml \ ${PROJECT_ROOT}/container-experience-kits/roles/sriov_nic_init/tasks/bind_vf_driver.yml +cp ${PROJECT_ROOT}/${INSTALLER}/ansible.cfg \ + ${PROJECT_ROOT}/container-experience-kits/ansible.cfg +cp ${PROJECT_ROOT}/${INSTALLER}/patched_rhel_packages.yml \ + ${PROJECT_ROOT}/container-experience-kits/roles/bootstrap/install_packages/tasks/rhel.yml + sudo docker run --rm \ -e ANSIBLE_CONFIG=/bmra/ansible.cfg \ -e PROFILE=${BMRA_PROFILE} \ |