Partner/yap
12
0
Fork 0
Code Pull Requests Projects Releases Activity

Merge pull request #3 in PAR/yap from bugfix/DEV-2031-yap-service-fails-on-start-of-6.4-aggregator to master

Browse Source 
* commit '97b8c07b312d43ed68a9f3dcaf38152a8fad8397':
  Don't run pwanbirdc disable on an empty output from bird. DEV-2031
This commit is contained in:
Emily Scoular 2019-01-08 13:37:42 -08:00
commit ffa181670a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/yap/aggregator/yap_aggregator
View File

@ -260,9 +260,9 @@ function disable_bird_protocols() {
bird_version=$(bird --version |& cut -d ' ' -f 3)
if [[ $bird_version =~ ^2 ]] ; then
pwanbirdc - show protocols| grep -e "^spc${space}_pwr" | cut -d ' ' -f1 | xargs -l pwanbirdc - disable
pwanbirdc - show protocols| grep -e "^spc${space}_pwr" | cut -d ' ' -f1 | xargs -r -l pwanbirdc - disable
else
pwanbirdc $space show protocols | grep -e '^pwr' | cut -d ' ' -f1 | xargs -l pwanbirdc $space disable
pwanbirdc $space show protocols | grep -e '^pwr' | cut -d ' ' -f1 | xargs -r -l pwanbirdc $space disable
fi
}