use pypi to install on Fedora
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import re
|
||||
import logging
|
||||
from subprocess import check_output
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
include:
|
||||
- salt.configs
|
||||
{% if grains['osarch'].lower().startswith('arm') %}
|
||||
{% if grains['osarch'].lower().startswith('arm') or grains['os'] == 'Fedora' %}
|
||||
- salt.pypi_install
|
||||
{% elif grains['os_family'] == 'Debian' %}
|
||||
- salt.deb_install
|
||||
|
||||
3
setup.sh
3
setup.sh
@@ -45,8 +45,7 @@ read
|
||||
|
||||
if ! [ -e /usr/bin/salt-call ]; then
|
||||
set -x
|
||||
if [[ "$(uname -m)" =~ arm* ]]; then
|
||||
echo -e "${CYAN}ARM processor detected - using pip/venv${NC}"
|
||||
if [[ "$(uname -m)" =~ arm* ]] || [[ "$DISTRO" == "fedora" ]]; then
|
||||
[ -e /opt/saltstack/salt ] ||
|
||||
python3 -m venv /opt/saltstack/salt
|
||||
/opt/saltstack/salt/bin/pip3 freeze | grep -q ^salt== ||
|
||||
|
||||
Reference in New Issue
Block a user