From 43517a02206af22dd563711333876f87fab0402e Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Mar 08 2017 17:50:54 +0000 Subject: install openSUSE:infrastructure only to the salt_cluster:opensuse VMs --- diff --git a/pillar/osrelease/11_4.sls b/pillar/osrelease/11_4.sls index ba4c42a..00ad6ea 100644 --- a/pillar/osrelease/11_4.sls +++ b/pillar/osrelease/11_4.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_11_SP4 - gpgcheck: 0 - priority: 100 - refresh: True SLE-SDK: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SLE11-SDK-SP4-Pool/sle-11-x86_64 priority: 99 diff --git a/pillar/osrelease/12.sls b/pillar/osrelease/12.sls index 34488fb..572b303 100644 --- a/pillar/osrelease/12.sls +++ b/pillar/osrelease/12.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12 - gpgcheck: 0 - priority: 100 - refresh: True SLE-Module-Adv-Systems-Management: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product priority: 99 diff --git a/pillar/osrelease/12_1.sls b/pillar/osrelease/12_1.sls index cd17220..dcc5ae1 100644 --- a/pillar/osrelease/12_1.sls +++ b/pillar/osrelease/12_1.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP1 - gpgcheck: 0 - priority: 100 - refresh: True SLE-Module-Adv-Systems-Management: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product priority: 99 diff --git a/pillar/osrelease/12_2.sls b/pillar/osrelease/12_2.sls index b84ea3f..dcb6ce7 100644 --- a/pillar/osrelease/12_2.sls +++ b/pillar/osrelease/12_2.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP2 - gpgcheck: 0 - priority: 100 - refresh: True SLE-Module-Adv-Systems-Management: baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Adv-Systems-Management/12/x86_64/product priority: 99 diff --git a/pillar/osrelease/42_1.sls b/pillar/osrelease/42_1.sls index ebc4114..4595de5 100644 --- a/pillar/osrelease/42_1.sls +++ b/pillar/osrelease/42_1.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.1 - gpgcheck: 0 - priority: 100 - refresh: True repo-oss: baseurl: http://download.opensuse.org/distribution/leap/42.1/repo/oss priority: 99 diff --git a/pillar/osrelease/42_2.sls b/pillar/osrelease/42_2.sls index d734c62..fde6e5b 100644 --- a/pillar/osrelease/42_2.sls +++ b/pillar/osrelease/42_2.sls @@ -1,10 +1,5 @@ zypper: repositories: - openSUSE:infrastructure: - baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.2 - gpgcheck: 0 - priority: 100 - refresh: True repo-oss: baseurl: http://download.opensuse.org/distribution/leap/42.2/repo/oss priority: 99 diff --git a/pillar/salt_cluster/opensuse/osrelease/11_4.sls b/pillar/salt_cluster/opensuse/osrelease/11_4.sls new file mode 100644 index 0000000..e207724 --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/11_4.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_11_SP4 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/salt_cluster/opensuse/osrelease/12.sls b/pillar/salt_cluster/opensuse/osrelease/12.sls new file mode 100644 index 0000000..6781833 --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/12.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/salt_cluster/opensuse/osrelease/12_1.sls b/pillar/salt_cluster/opensuse/osrelease/12_1.sls new file mode 100644 index 0000000..0318d42 --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/12_1.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP1 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/salt_cluster/opensuse/osrelease/12_2.sls b/pillar/salt_cluster/opensuse/osrelease/12_2.sls new file mode 100644 index 0000000..18708ca --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/12_2.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP2 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/salt_cluster/opensuse/osrelease/42_1.sls b/pillar/salt_cluster/opensuse/osrelease/42_1.sls new file mode 100644 index 0000000..4403a7a --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/42_1.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.1 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/salt_cluster/opensuse/osrelease/42_2.sls b/pillar/salt_cluster/opensuse/osrelease/42_2.sls new file mode 100644 index 0000000..897a4e6 --- /dev/null +++ b/pillar/salt_cluster/opensuse/osrelease/42_2.sls @@ -0,0 +1,7 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.2 + gpgcheck: 0 + priority: 100 + refresh: True diff --git a/pillar/top.sls b/pillar/top.sls index 9444d60..70bb3bb 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -41,6 +41,7 @@ production: 'salt_cluster:{{ salt_cluster }}': - match: grain - salt_cluster.{{ salt_cluster }} + - salt_cluster.{{ salt_cluster }}.osrelease.{{ osrelease }} '{{ id }}': - id.{{ id.replace('.', '_') }} {% endif %}