f5e035 Merge branch 'production' into 'cboltz-mysql'

Merged and Committed by Christian Boltz 7 years ago
52 files changed. 366 lines added. 119 lines removed.
pillar/common.sls
file modified
+8 -60
pillar/id/ariel_opensuse_org.sls
file modified
+2 -0
pillar/id/chip_opensuse_org.sls
file modified
+3 -0
pillar/id/ci-opensuse_opensuse_org.sls
file modified
+2 -0
pillar/id/minnie_opensuse_org.sls
file modified
+2 -2
pillar/id/svn2_opensuse_org.sls
file modified
+4 -0
pillar/osmajorrelease/11.sls
file added
+1
pillar/osmajorrelease/12.sls
file added
+1
pillar/osmajorrelease/12_or_42.sls
file added
+5
pillar/osmajorrelease/42.sls
file added
+16
pillar/osrelease/11_4.sls
file modified
+7 -2
pillar/osrelease/12.sls
file modified
+16 -15
pillar/osrelease/12_1.sls
file modified
+15 -14
pillar/osrelease/12_2.sls
file modified
+15 -14
pillar/osrelease/42_1.sls
file modified
+6 -1
pillar/osrelease/42_2.sls
file modified
+6 -1
pillar/role/git.sls
file added
+1
pillar/role/git_daemon.sls
file added
+14
pillar/role/jenkins.sls
file added
+9
pillar/role/ns.sls
file added
+1
pillar/role/ns_slave.sls
file added
+11
pillar/role/ntp.sls
file added
+36
pillar/role/ntp1.sls
file added
+8
pillar/role/ntp2.sls
file added
+8
pillar/role/obs.sls
file added
+6
pillar/role/openqa.sls
file added
+6
pillar/role/saltmaster.sls
file modified
+49 -0
pillar/role/svn.sls
file added
+1
pillar/salt_cluster/opensuse_or_suse_external.sls
file added
+12
pillar/top.sls
file modified
+12 -2
pillar/virt_cluster/atreju.sls
file modified
+1 -8
pillar/virtual/physical.sls
file added
+6
salt/profile/accounts/init.slssalt/profile/accounts.sls
file renamed
+1 -0
salt/profile/apparmor/auditd.sls
file added
+6
salt/profile/apparmor/init.sls
file added
+6
salt/profile/apparmor/packages.sls
file added
+14
salt/profile/apparmor/pillar.example
file added
+15
salt/profile/apparmor/profiles.sls
file added
+18
salt/profile/nameserver/slave.sls
file added
+3
salt/profile/zypper/init.slssalt/profile/zypper.sls
file renamed
+0 -0
salt/role/base.sls
file modified
+1 -0
salt/role/git.sls
file added
+1
salt/role/git_daemon.sls
file added
+1
salt/role/jenkins.sls
file added
+1
salt/role/ns.sls
file added
+1
salt/role/ns_slave.sls
file added
+2
salt/role/ntp.sls
file added
+1
salt/role/ntp1.sls
file added
+1
salt/role/ntp2.sls
file added
+1
salt/role/obs.sls
file added
+1
salt/role/openqa.sls
file added
+1
salt/role/svn.sls
file added
+1
    Merge branch 'production' into 'cboltz-mysql'
    
    Fix conflicts in pillar/common.sls, add mysql-formula to
    pillar/role/saltmaster.sls instead.
    
        
file modified
+8 -60
file modified
+7 -2
file modified
+16 -15
file modified
+15 -14
file modified
+15 -14
file modified
+6 -1
file modified
+6 -1
file added
+1
file added
+1
file added
+36
file added
+6
file modified
+49 -0
file added
+1
file modified
+12 -2
salt/profile/accounts/init.sls salt/profile/accounts.sls
file renamed
salt/profile/zypper/init.sls salt/profile/zypper.sls
file renamed
file was renamed with no change to the file
file modified
+1 -0
file added
+1
file added
+1
file added
+1
file added
+1
file added
+1
file added
+1
file added
+1