From fff352919c69ddd7ede21db630c1d4a9fbb5b784 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Oct 19 2016 10:34:28 +0000 Subject: Handle base repositories in salt --- diff --git a/pillar/osrelease/11_4.sls b/pillar/osrelease/11_4.sls new file mode 100644 index 0000000..d216eae --- /dev/null +++ b/pillar/osrelease/11_4.sls @@ -0,0 +1,22 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_11_SP4 + priority: 100 + refresh: True + SLE-SDK: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SLE11-SDK-SP4-Pool/sle-11-x86_64 + priority: 99 + refresh: True + SLE-SDK-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SLE11-SDK-SP4-Updates/sle-11-x86_64 + priority: 99 + refresh: True + SLE-SERVER: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SLES11-SP4-Pool/sle-11-x86_64 + priority: 99 + refresh: True + SLE-SERVER-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SLES11-SP4-Updates/sle-11-x86_64 + priority: 99 + refresh: True diff --git a/pillar/osrelease/12.sls b/pillar/osrelease/12.sls new file mode 100644 index 0000000..115395c --- /dev/null +++ b/pillar/osrelease/12.sls @@ -0,0 +1,38 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12 + 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 + refresh: True + SLE-Module-Adv-Systems-Management-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update + priority: 99 + refresh: True + SLE-Module-Web-Scripting: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product + priority: 99 + refresh: True + SLE-Module-Web-Scripting-Update + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update + priority: 99 + refresh: True + SLE-SDK: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/121/x86_64/product + priority: 99 + refresh: True + SLE-SDK-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/12/x86_64/update + priority: 99 + refresh: True + SLE-SERVER: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/12/x86_64/product + priority: 99 + refresh: True + SLE-SERVER-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12/x86_64/update + priority: 99 + refresh: True diff --git a/pillar/osrelease/12_1.sls b/pillar/osrelease/12_1.sls new file mode 100644 index 0000000..a87c998 --- /dev/null +++ b/pillar/osrelease/12_1.sls @@ -0,0 +1,38 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP1 + 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 + refresh: True + SLE-Module-Adv-Systems-Management-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update + priority: 99 + refresh: True + SLE-Module-Web-Scripting: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product + priority: 99 + refresh: True + SLE-Module-Web-Scripting-Update + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update + priority: 99 + refresh: True + SLE-SDK: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/12-SP1/x86_64/product + priority: 99 + refresh: True + SLE-SDK-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/12-SP1/x86_64/update + priority: 99 + refresh: True + SLE-SERVER: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/12-SP1/x86_64/product + priority: 99 + refresh: True + SLE-SERVER-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12-SP1/x86_64/update + priority: 99 + refresh: True diff --git a/pillar/osrelease/12_2.sls b/pillar/osrelease/12_2.sls new file mode 100644 index 0000000..31413bc --- /dev/null +++ b/pillar/osrelease/12_2.sls @@ -0,0 +1,38 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/SLE_12_SP2 + 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 + refresh: True + SLE-Module-Adv-Systems-Management-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Adv-Systems-Management/12/x86_64/update + priority: 99 + refresh: True + SLE-Module-Web-Scripting: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-Module-Web-Scripting/12/x86_64/product + priority: 99 + refresh: True + SLE-Module-Web-Scripting-Update + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-Module-Web-Scripting/12/x86_64/update + priority: 99 + refresh: True + SLE-SDK: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SDK/12-SP2/x86_64/product + priority: 99 + refresh: True + SLE-SDK-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SDK/12-SP2/x86_64/update + priority: 99 + refresh: True + SLE-SERVER: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Products/SLE-SERVER/12-SP2/x86_64/product + priority: 99 + refresh: True + SLE-SERVER-Update: + baseurl: http://smt-internal.opensuse.org/repo/$RCE/SUSE/Updates/SLE-SERVER/12-SP2/x86_64/update + priority: 99 + refresh: True diff --git a/pillar/osrelease/42_1.sls b/pillar/osrelease/42_1.sls new file mode 100644 index 0000000..111288a --- /dev/null +++ b/pillar/osrelease/42_1.sls @@ -0,0 +1,14 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.1 + priority: 100 + refresh: True + repo-oss: + baseurl: http://download.opensuse.org/distribution/leap/42.1/repo/oss + priority: 99 + refresh: True + repo-update-oss: + baseurl: http://download.opensuse.org/update/leap/42.1/oss + priority: 99 + refresh: True diff --git a/pillar/osrelease/42_2.sls b/pillar/osrelease/42_2.sls new file mode 100644 index 0000000..e425ec6 --- /dev/null +++ b/pillar/osrelease/42_2.sls @@ -0,0 +1,14 @@ +zypper: + repositories: + openSUSE:infrastructure: + baseurl: http://download.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_42.2 + priority: 100 + refresh: True + repo-oss: + baseurl: http://download.opensuse.org/distribution/leap/42.2/repo/oss + priority: 99 + refresh: True + repo-update-oss: + baseurl: http://download.opensuse.org/update/leap/42.2/oss + priority: 99 + refresh: True diff --git a/pillar/top.sls b/pillar/top.sls index 768335f..1363f9a 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -1,3 +1,8 @@ +{% set osrelease = salt['grains.get']('osrelease') %} + production: '*': - common + 'osrelease:{{ osrelease }}': + - match: grain + - osrelease.{{ osrelease.replace('.', '_') }} diff --git a/salt/profile/zypper.sls b/salt/profile/zypper.sls index 2ec3a17..1b4530b 100644 --- a/salt/profile/zypper.sls +++ b/salt/profile/zypper.sls @@ -1,2 +1,3 @@ include: - profile.zypper.config + - profile.zypper.repositories diff --git a/salt/profile/zypper/repositories.sls b/salt/profile/zypper/repositories.sls new file mode 100644 index 0000000..a6f9948 --- /dev/null +++ b/salt/profile/zypper/repositories.sls @@ -0,0 +1,13 @@ +{% set repositories = salt['pillar.get']('zypper:repositories', {}) %} + +{% for repo, data in repositories.items() %} +{{ repo }}: + pkgrepo.managed: + - baseurl: {{ data.baseurl }} +{% if data.has_key('priority') %} + - priority: {{ data.priority }} +{% endif %} +{% if data.has_key('refresh') %} + - refresh: {{ data.refresh }} +{% endif %} +{% endfor %}