c35860 Replace country with site grain

Authored and Committed by crameleon a year ago
133 files changed. 180 lines added. 180 lines removed.
README.md
file modified
+1 -1
bin/get_valid_custom_grains.py
file modified
+5 -5
bin/prepare_test_env.sh
file modified
+2 -2
bin/test_custom_grains.py
file modified
+4 -4
bin/test_show_highstate.sh
file modified
+4 -4
pillar/cluster/asgard/network.sls
file modified
+2 -2
pillar/cluster/asgard/vrrp.sls
file modified
+2 -2
pillar/common/init.sls
file modified
+4 -4
pillar/common/monitoring/listen.sls
file modified
+1 -1
pillar/common/network.sls
file modified
+14 -14
pillar/id/README.md
file modified
+1 -1
pillar/id/acme_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/apollo01_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/asgard1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/asgard2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/atlas1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/atlas2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/backup_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/calendar_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/chip_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/community2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/dale_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/devcon_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/discourse01_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/download_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/elections2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/etherpad_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/falkor20_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/falkor21_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/falkor22_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/galera1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/galera2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/galera3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/gcc-stats_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/gitlab-runner1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/gitlab-runner2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/hel1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/hel2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/imagetest_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/ipx-galera1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/ipx-galera2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/ipx-galera3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/ipx-narwal1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/ipx-proxy1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/jekyll_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/kani-test_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/kani1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/kani2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/kubic_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/limesurvey_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/lnt_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/login3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mailman3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/man_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/matomo_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/matrix_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/metrics_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mickey_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/minio_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mirrorcache-us-db_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mirrorcache-us_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mirrordb1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mirrordb2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mirrordb3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/monitor_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mx-test_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mx1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mx2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mx3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mx4_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/mybackup_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/nala2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/nala_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/narwal4_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/narwal5_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/narwal6_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/narwal7_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/narwal8_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/netbox1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/obsreview_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/odin_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/opi-proxy_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/orbit20_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/orbit21_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/osc-collab_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/pagure01_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/paste_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/pinot_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/prg-ns1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/prg-ns2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/progressoo_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-galera1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-galera2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-galera3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-gate_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-mirror_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-ns_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/provo-proxy1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/qsc-ns3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/riesling2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/riesling3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/riesling_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/rpmlint_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/slimhat_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/squanchy_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/status1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/status2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/status3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/svn_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/thor1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/thor2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/tsp_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/warp_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/water2_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/water3_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/water4_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/water_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/widehat_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/witch1_infra_opensuse_org.sls
file modified
+1 -1
pillar/id/witch2_infra_opensuse_org.sls
file modified
+1 -1
pillar/infra/networks.yaml
file modified
+1 -1
pillar/osfullname/map.jinja
file modified
+4 -4
pillar/role/common/apache.sls
file modified
+4 -4
pillar/role/common/mirrorcache.sls
file modified
+2 -2
pillar/role/common/nginx.sls
file modified
+3 -3
pillar/role/saltmaster.sls
file modified
+2 -2
pillar/role/status.sls
file modified
+3 -3
pillar/role/web_static.sls
file modified
+1 -1
pillar/secrets/mirrorcache.sls
file modified
+3 -3
pillar/valid_custom_grains.yaml
file modified
+4 -4
salt/_runners/os_pillar.py
file modified
+2 -2
salt/profile/qemu-guest-agent.sls
file modified
+1 -1
salt/role/base.sls
file modified
+1 -1
    Replace country with site grain
    
    To allow for multiple sites per country (for example in case of
    locations in multiple cities in one country, or even multiple
    locations in one city), and to make mapping of locations to the
    DCIM/IPAM data (which already uses the site codes) easier, replace
    the "country" grain with a "site" one and refactor logic related to
    it to reflect the change.
    
    References are replaced with the respective, already defined, site
    codes.
    
    Signed-off-by: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
    
        
file modified
+1 -1
file modified
+2 -2
file modified
+4 -4
file modified
+4 -4
file modified
+4 -4
file modified
+14 -14
file modified
+1 -1
file modified
+1 -1
file modified
+4 -4
file modified
+3 -3
file modified
+2 -2
file modified
+3 -3
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1