diff --git a/charmcraft.yaml b/charmcraft.yaml index a42bde6..9a3942b 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -13,9 +13,6 @@ bases: - name: ubuntu channel: "20.04" architectures: [amd64] - - name: centos - channel: "7" - architectures: [amd64] parts: charm: diff --git a/config.yaml b/config.yaml index 228987b..2d4798e 100644 --- a/config.yaml +++ b/config.yaml @@ -8,9 +8,7 @@ options: This can be set to the Organization's local mirror/cache of packages and supersedes the Omnivector repositories. Alternatively, it can be used to track a `testing` Slurm version, e.g. by setting to - `ppa:omnivector/osd-testing` (on Ubuntu), or - `https://omnivector-solutions.github.io/repo/centos7/stable/$basearch` - (on CentOS). + `ppa:omnivector/osd-testing`. Note: The configuration `custom-slurm-repo` must be set *before* deploying the units. Changing this value after deploying the units will diff --git a/dispatch b/dispatch index 8b98ae9..f184c38 100755 --- a/dispatch +++ b/dispatch @@ -1,43 +1,6 @@ #!/bin/bash -# This hook installs the centos dependencies needed to run the charm, -# creates the dispatch executable, regenerates the symlinks for start and -# upgrade-charm, and kicks off the operator framework. +# This hook creates the dispatch executable and kicks off the operator framework. set -e -# Source the os-release information into the env. -. /etc/os-release - -if ! [[ -f '.installed' ]] -then - # Determine if we are running in centos or ubuntu, if centos - # provision the needed prereqs. - if [[ $ID == 'ubuntu' ]] - then - echo "Running Ubuntu." - echo "Nothing to do." - elif [[ $ID == 'centos' ]] - then - # Determine the centos version and install prereqs accordingly - major=$(cat /etc/centos-release | tr -dc '0-9.'|cut -d \. -f1) - echo "Running CentOS$major, installing prereqs." - if [[ $major == "7" ]] - then - yum -y install epel-release - yum -y install yum-priorities python3 - elif [[ $major == "8" ]] - then - dnf -y install epel-release - dnf -y install yum-priorities python3 - else - echo "Running unsuppored version of centos: $major" - exit -1 - fi - else - echo "Running unsuppored os: $ID" - exit -1 - fi - touch .installed -fi - JUJU_DISPATCH_PATH="${JUJU_DISPATCH_PATH:-$0}" PYTHONPATH=lib:venv ./src/charm.py