diff --git a/pillar/common.sls b/pillar/common.sls index 21b1759..0829a2b 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -3,4 +3,3 @@ salt: backup_mode: minion environment: production hash_type: sha512 - master: minnie.opensuse.org diff --git a/pillar/domain/opensuse_org.sls b/pillar/domain/opensuse_org.sls new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/pillar/domain/opensuse_org.sls @@ -0,0 +1 @@ +# diff --git a/pillar/id/ariel_opensuse_org.sls b/pillar/id/ariel_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/ariel_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/baloo_opensuse_org.sls b/pillar/id/baloo_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/baloo_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/boosters_opensuse_org.sls b/pillar/id/boosters_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/boosters_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/chip_opensuse_org.sls b/pillar/id/chip_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/chip_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/ci-opensuse_opensuse_org.sls b/pillar/id/ci-opensuse_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/ci-opensuse_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/community_opensuse_org.sls b/pillar/id/community_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/community_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/conference_opensuse_org.sls b/pillar/id/conference_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/conference_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/dale_opensuse_org.sls b/pillar/id/dale_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/dale_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/disquss_opensuse_org.sls b/pillar/id/disquss_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/disquss_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/donald_opensuse_org.sls b/pillar/id/donald_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/donald_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/gaston_opensuse_org.sls b/pillar/id/gaston_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/gaston_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/icc_opensuse_org.sls b/pillar/id/icc_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/icc_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/keyserver_opensuse_org.sls b/pillar/id/keyserver_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/keyserver_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/mickey_opensuse_org.sls b/pillar/id/mickey_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/mickey_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/minnie_opensuse_org.sls b/pillar/id/minnie_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/minnie_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/narwal2_opensuse_org.sls b/pillar/id/narwal2_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/narwal2_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/narwal3_opensuse_org.sls b/pillar/id/narwal3_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/narwal3_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/narwal_opensuse_org.sls b/pillar/id/narwal_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/narwal_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/redmine_opensuse_org.sls b/pillar/id/redmine_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/redmine_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/roadrunner_opensuse_org.sls b/pillar/id/roadrunner_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/roadrunner_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/id/svn2_opensuse_org.sls b/pillar/id/svn2_opensuse_org.sls new file mode 100644 index 0000000..2b4e48f --- /dev/null +++ b/pillar/id/svn2_opensuse_org.sls @@ -0,0 +1,5 @@ +grains: + city: nuremberg + country: de + salt_cluster: opensuse + virt_cluster: atreju diff --git a/pillar/salt_cluster/opensuse.sls b/pillar/salt_cluster/opensuse.sls new file mode 100644 index 0000000..4fbbcc1 --- /dev/null +++ b/pillar/salt_cluster/opensuse.sls @@ -0,0 +1,3 @@ +salt: + minion: + master: minnie.opensuse.org diff --git a/pillar/top.sls b/pillar/top.sls index 9343e77..b039add 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -3,6 +3,7 @@ {% set id = salt['grains.get']('id') %} {% set osrelease = salt['grains.get']('osrelease') %} {% set roles = salt['pillar.get']('roles', []) %} +{% set salt_cluster = salt['pillar.get']('salt_cluster', '') %} {% set virt_cluster = salt['pillar.get']('virt_cluster', '') %} {% set virtual = salt['grains.get']('virtual') %} @@ -33,5 +34,8 @@ production: 'osrelease:{{ osrelease }}': - match: grain - osrelease.{{ osrelease.replace('.', '_') }} + 'salt_cluster:{{ salt_cluster }}': + - match: grain + - salt_cluster.{{ salt_cluster }} '{{ id }}': - id.{{ id.replace('.', '_') }} diff --git a/pillar/virt_cluster/atreju.sls b/pillar/virt_cluster/atreju.sls new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/pillar/virt_cluster/atreju.sls @@ -0,0 +1 @@ +# diff --git a/pillar/virtual/kvm.sls b/pillar/virtual/kvm.sls new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/pillar/virtual/kvm.sls @@ -0,0 +1 @@ +#