Skip to content

Commit

Permalink
Bump metal3-dev-env version (openshift#1221)
Browse files Browse the repository at this point in the history
So we pick up metal3-io/metal3-dev-env#619

This is needed for testing live-iso install ref openshift#1193 since that needs
the sushy_ignore_boot_device option
  • Loading branch information
Steven Hardy authored Apr 20, 2021
1 parent 33efe8c commit 7fa7e1a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
22 changes: 20 additions & 2 deletions 01_install_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,31 @@ if [ -z "${METAL3_DEV_ENV}" ]; then
# TODO -- come up with a plan for continuously updating this
# Note we only do this in the case where METAL3_DEV_ENV is
# unset, to enable developer testing of local checkouts
git reset 553e12f0f6c5f1af6761d7b4799e77b5df607572 --hard
git reset 8908da5241d52e25a7e1b2e60d6d604cf797f890 --hard
popd
fi

# Update to latest packages first
sudo dnf -y upgrade

# Install additional repos as needed for each OS version
# shellcheck disable=SC1091
source /etc/os-release
export DISTRO="${ID}${VERSION_ID%.*}"
if [[ $DISTRO == "centos8" ]]; then
sudo dnf -y install epel-release dnf --enablerepo=extras
elif [[ $DISTRO == "rhel8" ]]; then
sudo subscription-manager repos --enable=ansible-2-for-rhel-8-x86_64-rpms
fi

# Install ansible, other packages are installed via
# vm-setup/install-package-playbook.yml
sudo dnf -y install python3 ansible
sudo alternatives --set python /usr/bin/python3

pushd ${METAL3_DEV_ENV_PATH}
./centos_install_requirements.sh
ansible-galaxy install -r vm-setup/requirements.yml
ansible-galaxy collection install ansible.netcommon ansible.posix
ANSIBLE_FORCE_COLOR=true ansible-playbook \
-e "working_dir=$WORKING_DIR" \
-e "virthost=$HOSTNAME" \
Expand Down
1 change: 1 addition & 0 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ else
export METAL3_DEV_ENV_PATH="${METAL3_DEV_ENV}"
fi
export VM_SETUP_PATH="${METAL3_DEV_ENV_PATH}/vm-setup"
export CONTAINER_RUNTIME="podman"

export NUM_MASTERS=${NUM_MASTERS:-"3"}
export NUM_WORKERS=${NUM_WORKERS:-"2"}
Expand Down

0 comments on commit 7fa7e1a

Please sign in to comment.