a3e98c Merge branch 'add_machines' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'add_machines' into 'production'
    
    add pontifex and metrics VMs
    
    See merge request infra/salt!190