924c34 Merge branch 'cboltz-haproxy' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'cboltz-haproxy' into 'production'
    
    "proxy" role: Make sure haproxy is installed and running
    
    See merge request infra/salt!294
        
file modified
+1 -0