8718d4 Merge branch 'cboltz-pillar-id-fixes' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'cboltz-pillar-id-fixes' into 'production'
    
    pillar/id/ fixes
    
    See merge request infra/salt!292
        
pillar/id/aedir1_infra_opensuse_org.sls pillar/id/aedir1.infra.opensuse.org.sls
file renamed
pillar/id/aedir2_infra_opensuse_org.sls pillar/id/aedir2.infra.opensuse.org.sls
file renamed
pillar/id/galera1_infra_opensuse_org.sls pillar/id/galera1.infra.opensuse.org.sls
file renamed
file was renamed with no change to the file
pillar/id/galera2_infra_opensuse_org.sls pillar/id/galera2.infra.opensuse.org.sls
file renamed
file was renamed with no change to the file
pillar/id/galera3_infra_opensuse_org.sls pillar/id/galera3.infra.opensuse.org.sls
file renamed
file was renamed with no change to the file