config-mgmt/salt-states
0
0
Fork 0
Code Releases Activity

use pypi to install on Fedora

Browse Source
This commit is contained in:
Keiran Snowden
2023-12-22 22:09:59 -05:00
parent a07114ed85
commit f6dc76ec65
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_grains/lsusb.py
View File

@@ -1,4 +1,5 @@
import re import re
import logging
from subprocess import check_output from subprocess import check_output
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
salt/init.sls
View File

@@ -1,6 +1,6 @@
include: include:
- salt.configs - salt.configs
{% if grains['osarch'].lower().startswith('arm') %} {% if grains['osarch'].lower().startswith('arm') or grains['os'] == 'Fedora' %}
- salt.pypi_install - salt.pypi_install
{% elif grains['os_family'] == 'Debian' %} {% elif grains['os_family'] == 'Debian' %}
- salt.deb_install - salt.deb_install

3
setup.sh
View File

@@ -45,8 +45,7 @@ read
if ! [ -e /usr/bin/salt-call ]; then if ! [ -e /usr/bin/salt-call ]; then
set -x set -x
if [[ "$(uname -m)" =~ arm* ]]; then if [[ "$(uname -m)" =~ arm* ]] || [[ "$DISTRO" == "fedora" ]]; then
echo -e "${CYAN}ARM processor detected - using pip/venv${NC}"
[ -e /opt/saltstack/salt ] || [ -e /opt/saltstack/salt ] ||
python3 -m venv /opt/saltstack/salt python3 -m venv /opt/saltstack/salt
/opt/saltstack/salt/bin/pip3 freeze | grep -q ^salt== || /opt/saltstack/salt/bin/pip3 freeze | grep -q ^salt== ||