3adeae Merge branch 'aedir_reboot_safe' into 'production'

Merged and Committed by Christian Boltz 3 years ago
    Merge branch 'aedir_reboot_safe' into 'production'
    
    pillar/id entries for AE-DIR test servers
    
    See merge request infra/salt!244