Merge pull request #22 from noelmcloughlin/fixrepo

fix(repo): allow oscode pillar; suse default is tumbleweed
saltstack-formulas · Jul 3, 2019 · cf2bb39 · cf2bb39
2 parents 8bdb752 + be9f11e
commit cf2bb39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ceph/defaults.yaml b/ceph/defaults.yaml
@@ -2,9 +2,10 @@
 # vim: ft=yaml
 
 ceph:
-  release: luminous
+  release: nautilus
   use_upstream_repo: true
   fromrepo: ''
+  oscode: ''
   packages:
     - ceph
   cluster_name: ceph

diff --git a/ceph/osfamilymap.yaml b/ceph/osfamilymap.yaml
@@ -16,10 +16,11 @@ RedHat:
     baseurl: '{{ repo.official }}/rpm-{{ repo.release }}/el{{ grains.osrelease_info[0] }}/$basearch'
 
 Suse:
+  oscode: openSUSE_Tumbleweed
   pkg_repo:
     name: ceph-opensuse-{{ repo.release }}
     humanname: Ceph {{ repo.release }} $releasever - $basearch
-    baseurl: '{{ repo.suse }}:/ceph:/{{ repo.release }}/{{ repo.oscode }}/$basearch'
+    baseurl: '{{ repo.suse }}:/ceph:/{{ repo.release }}/{{ repo.oscode }}'
     key_url: '{{ repo.suse }}:/ceph:/{{ repo.release }}/{{ repo.oscode }}/repodata/repomd.xml.key'
     gpgcheck: 1
     gpgautoimport: True

diff --git a/ceph/repo/map.jinja b/ceph/repo/map.jinja
@@ -6,10 +6,15 @@
 {% set use_upstream_repo = salt['pillar.get']('ceph:use_upstream_repo', defaults.ceph.use_upstream_repo) %}
 {% set release = salt['pillar.get']('ceph:release', defaults.ceph.release) %}
 {% set fromrepo = salt['pillar.get']('ceph:fromrepo', defaults.ceph.fromrepo) %}
-{% set oscode = salt['grains.get']('oscodename') | replace(' ','_') %}
 {% set user = salt['pillar.get']('ceph.user', None) %}
 {% set group = salt['pillar.get']('ceph.group', None) %}
 
+{%- if grains.os_family == 'Suse' %}
+    {% set oscode = salt['pillar.get']('ceph.oscode','openSUSE_Tumbleweed') | replace(' ','_') %}
+{%- else %}
+    {% set oscode = salt['pillar.get']('ceph.oscode', salt['grains.get']('oscodename')) | replace(' ','_') %}
+{%- endif %}
+
 {% if grains.os == 'MacOS' %}
   {% set user = salt['pillar.get']('ceph.user') or salt['cmd.run']("stat -f '%Su' /dev/console") %}
   {% set group = salt['pillar.get']('ceph.group') or salt['cmd.run']("stat -f '%Sg' /dev/console") %}

diff --git a/pillar.example b/pillar.example
@@ -1,6 +1,7 @@
 ceph:
-  release: luminous
+  release: nautilus
   use_upstream_repo: false
+  #oscode: OpenSUSE_Fumbleweed
 
   config:
     file: /etc/ceph/ceph.conf