91e595 Merge branch 'cboltz-keepalived-proxy' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'cboltz-keepalived-proxy' into 'production'
    
    split the proxy keepalived ipv4 and ipv6 sections due to an upstream change - v2
    
    See merge request infra/salt!298
        
file modified
+20 -5
file modified
+4 -1
file modified
+4 -1
file modified
+76 -1