diff --git a/pillar/osrelease/12.sls b/pillar/osrelease/12.sls index 2af09b2..9e31b91 100644 --- a/pillar/osrelease/12.sls +++ b/pillar/osrelease/12.sls @@ -34,7 +34,7 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12/x86_64/update priority: 99 refresh: True -{% if 'ha' in roles %} + {% if 'ha' in roles %} SLE-HA-POOL: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/12/x86_64/product priority: 99 @@ -43,4 +43,4 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/12/x86_64/update priority: 99 refresh: True -{% endif %} + {% endif %} diff --git a/pillar/osrelease/12_1.sls b/pillar/osrelease/12_1.sls index 41069b0..e73c294 100644 --- a/pillar/osrelease/12_1.sls +++ b/pillar/osrelease/12_1.sls @@ -34,7 +34,7 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12-SP1/x86_64/update priority: 99 refresh: True -{% if 'ha' in roles %} + {% if 'ha' in roles %} SLE-HA-POOL: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/12-SP1/x86_64/product priority: 99 @@ -43,4 +43,4 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/12-SP1/x86_64/update priority: 99 refresh: True -{% endif %} + {% endif %} diff --git a/pillar/osrelease/12_2.sls b/pillar/osrelease/12_2.sls index 7421d29..33a3133 100644 --- a/pillar/osrelease/12_2.sls +++ b/pillar/osrelease/12_2.sls @@ -34,7 +34,7 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12-SP2/x86_64/update priority: 99 refresh: True -{% if 'ha' in roles %} + {% if 'ha' in roles %} SLE-HA-POOL: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-HA/12-SP2/x86_64/product priority: 99 @@ -43,5 +43,4 @@ zypper: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-HA/12-SP2/x86_64/update priority: 99 refresh: True -{% endif %} - + {% endif %} diff --git a/pillar/top.sls b/pillar/top.sls index 3a5d52f..de02d9d 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -37,11 +37,11 @@ production: 'osrelease:{{ osrelease }}': - match: grain - osrelease.{{ osrelease.replace('.', '_') }} -{% if salt_cluster == 'opensuse' %} + {% if salt_cluster == 'opensuse' %} 'salt_cluster:{{ salt_cluster }}': - match: grain - salt_cluster.{{ salt_cluster }} - salt_cluster.{{ salt_cluster }}.osrelease.{{ osrelease.replace('.', '_') }} '{{ id }}': - id.{{ id.replace('.', '_') }} -{% endif %} + {% endif %}