ebbd64 Merge branch 'cboltz-machine-info' into 'production'

Merged and Committed by Christian Boltz 3 years ago
    Merge branch 'cboltz-machine-info' into 'production'
    
    Last round of hostinfo additions in pillar/id/
    
    See merge request infra/salt!270