kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

__netbox: adjusted command flags

Browse source 
Mostly added -q to the pip calls. Also forced the temp directory removal.
This commit is contained in:
matze 2020-10-06 17:29:31 +02:00
parent 8f1b56026c
commit 0b3bc14530
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
type/__netbox/gencode-remote
View file

@ -63,18 +63,18 @@ virtualenv -p python3 /opt/netbox/venv
awk -F== '{print $1}' '/opt/netbox/requirements.txt' | sort > "\$tmpdir/curr-reqs.txt" awk -F== '{print $1}' '/opt/netbox/requirements.txt' | sort > "\$tmpdir/curr-reqs.txt"
awk -F== '{print $1}' '/opt/netbox/old-requirements.txt' | sort > "\$tmpdir/old-reqs.txt" awk -F== '{print $1}' '/opt/netbox/old-requirements.txt' | sort > "\$tmpdir/old-reqs.txt"
comm -23 "\$tmpdir/curr-reqs.txt" "\$tmpdir/old-reqs.txt" \ comm -23 "\$tmpdir/curr-reqs.txt" "\$tmpdir/old-reqs.txt" \
| xargs /opt/netbox/venv/bin/pip3 uninstall -y | xargs /opt/netbox/venv/bin/pip3 uninstall -qy
# Install python dependencies. # Install python dependencies.
# avoid gunicorn, because it will be done in an other type # avoid gunicorn, because it will be done in an other type
grep -v "^gunicorn==" "\$tmpdir/$src/requirements.txt" \ grep -v "^gunicorn==" "\$tmpdir/$src/requirements.txt" \
| xargs /opt/netbox/venv/bin/pip3 install | xargs /opt/netbox/venv/bin/pip3 install -q
EOF EOF
if [ -f "$__object/parameter/ldap-server" ]; then if [ -f "$__object/parameter/ldap-server" ]; then
echo "/opt/netbox/venv/bin/pip3 install django-auth-ldap" echo "/opt/netbox/venv/bin/pip3 install -q django-auth-ldap"
else else
echo "/opt/netbox/venv/bin/pip3 uninstall -y django-auth-ldap" echo "/opt/netbox/venv/bin/pip3 uninstall -qy django-auth-ldap"
fi fi
cat << EOF cat << EOF
@ -95,7 +95,7 @@ sudo -u netbox /opt/netbox/venv/bin/python3 /opt/netbox/netbox/manage.py invalid
# Remove temporary working directory. # Remove temporary working directory.
cd / cd /
rm -r "\$tmpdir" rm -rf "\$tmpdir"
# Save version after successful installation # Save version after successful installation
printf "%s\\n" "$VERSION" > /opt/netbox/cdist/version printf "%s\\n" "$VERSION" > /opt/netbox/cdist/version