c19842 Merge branch 'tampakrap_test_grains' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_test_grains' into 'production'
    
    Validate custom grains
    
    See merge request infra/salt!85
        
file modified
+8 -0
file modified
+15 -0
file modified
+2 -1