dd4552 Merge branch 'tampakrap_keepalived_fixes' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_keepalived_fixes' into 'production'
    
    various fixes for the keepalived.conf pillars
    
    See merge request infra/salt!80
        
file modified
+6 -6
file modified
+1 -1
file modified
+1 -1