diff --git a/.rubocop.yml b/.rubocop.yml
index bdae9aa..96fd6e5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,7 @@
# vim: ft=yaml
---
# General overrides used across formulas in the org
-Metrics/LineLength:
+Layout/LineLength:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
diff --git a/.travis.yml b/.travis.yml
index 37d9a3d..c5835de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,16 +66,16 @@ jobs:
# - env: INSTANCE=v201707-py2-debian-8-2017-7-py2
- env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2
- env: INSTANCE=v201707-py2-centos-6-2017-7-py2
- # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
+ # - env: INSTANCE=v201707-py2-amazonlinux-1-2017-7-py2
# - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
- env: INSTANCE=v201803-py2-debian-9-2018-3-py2
# - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
- env: INSTANCE=v201803-py2-centos-7-2018-3-py2
- # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
+ # - env: INSTANCE=v201803-py2-amazonlinux-1-2018-3-py2
# - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
- env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
# - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
- - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
+ - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3
# - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
- env: INSTANCE=v201902-py3-debian-10-2019-2-py3
# - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
diff --git a/AUTHORS.md b/AUTHORS.md
index 43bf7ba..c4bf346 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,15 +5,15 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|100
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|72
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|68
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7139195?v=4' width='36' height='36' alt='@xenophonf'>|[@xenophonf](https://github.com/xenophonf)|18
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|16
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>|[@andrew-vant](https://github.com/andrew-vant)|13
-<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|13
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|12
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1013915?v=4' width='36' height='36' alt='@rhertzog'>|[@rhertzog](https://github.com/rhertzog)|11
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/358074?v=4' width='36' height='36' alt='@pcdummy'>|[@pcdummy](https://github.com/pcdummy)|11
@@ -107,4 +107,4 @@ Avatar|Contributor|Contributions
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-01-24.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-02-13.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d774fc..d8e8501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Changelog
+## [1.1.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.2...v1.1.3) (2020-02-13)
+
+
+### Bug Fixes
+
+* **tpl_path:** replace slspath to tplroot ([bbcc4cd](https://github.com/saltstack-formulas/salt-formula/commit/bbcc4cda7ada4470db07dc02a5938a5b650e2f1c))
+
+
+### Continuous Integration
+
+* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([d2d5186](https://github.com/saltstack-formulas/salt-formula/commit/d2d51864a5e4e5584afa979378ded15b1c5b9366))
+
+## [1.1.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.1...v1.1.2) (2020-01-25)
+
+
+### Code Refactoring
+
+* **mapping:** simplify py version handling ([715e3b8](https://github.com/saltstack-formulas/salt-formula/commit/715e3b8fa495ed2c8e9f4a5fbbb6398021ac9ec7))
+
## [1.1.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.0...v1.1.1) (2020-01-24)
diff --git a/FORMULA b/FORMULA
index 70a5b56..29549a9 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: salt
os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 1.1.1
+version: 1.1.3
release: 1
minimum_version: 2015.8
summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 2d3887d..37312b8 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -16,12 +16,12 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
- `@aboe76 <https://github.com/aboe76>`_
- 100
+ * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
+ - `@myii <https://github.com/myii>`_
+ - 72
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
- `@gravyboat <https://github.com/gravyboat>`_
- 71
- * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
- - `@myii <https://github.com/myii>`_
- - 68
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
- `@nmadhok <https://github.com/nmadhok>`_
- 54
@@ -37,11 +37,11 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7139195?v=4' width='36' height='36' alt='@xenophonf'>`
- `@xenophonf <https://github.com/xenophonf>`_
- 18
- * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>`
- - `@andrew-vant <https://github.com/andrew-vant>`_
- - 13
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
+ - 16
+ * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>`
+ - `@andrew-vant <https://github.com/andrew-vant>`_
- 13
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
- `@whiteinge <https://github.com/whiteinge>`_
@@ -317,4 +317,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
----
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-01-24.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-02-13.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index eaa9a6e..9bea250 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,30 @@
Changelog
=========
+`1.1.3 <https://github.com/saltstack-formulas/salt-formula/compare/v1.1.2...v1.1.3>`_ (2020-02-13)
+------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **tpl_path:** replace slspath to tplroot (\ `bbcc4cd <https://github.com/saltstack-formulas/salt-formula/commit/bbcc4cda7ada4470db07dc02a5938a5b650e2f1c>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `d2d5186 <https://github.com/saltstack-formulas/salt-formula/commit/d2d51864a5e4e5584afa979378ded15b1c5b9366>`_\ )
+
+`1.1.2 <https://github.com/saltstack-formulas/salt-formula/compare/v1.1.1...v1.1.2>`_ (2020-01-25)
+------------------------------------------------------------------------------------------------------
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **mapping:** simplify py version handling (\ `715e3b8 <https://github.com/saltstack-formulas/salt-formula/commit/715e3b8fa495ed2c8e9f4a5fbbb6398021ac9ec7>`_\ )
+
`1.1.1 <https://github.com/saltstack-formulas/salt-formula/compare/v1.1.0...v1.1.1>`_ (2020-01-24)
------------------------------------------------------------------------------------------------------
diff --git a/kitchen.yml b/kitchen.yml
index db09584..6c69f74 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -22,9 +22,10 @@ platforms:
driver:
image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init
- - name: amazonlinux-2-2017-7-py2
+ - name: amazonlinux-1-2017-7-py2
driver:
- image: netmanagers/salt-2017.7-py2:amazonlinux-2
+ image: netmanagers/salt-2017.7-py2:amazonlinux-1
+ run_command: /sbin/init
- name: arch-base-latest-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:arch-base-latest
@@ -40,9 +41,10 @@ platforms:
- name: centos-7-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:centos-7
- - name: amazonlinux-2-2018-3-py2
+ - name: amazonlinux-1-2018-3-py2
driver:
- image: netmanagers/salt-2018.3-py2:amazonlinux-2
+ image: netmanagers/salt-2018.3-py2:amazonlinux-1
+ run_command: /sbin/init
- name: arch-base-latest-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:arch-base-latest
@@ -55,9 +57,9 @@ platforms:
- name: centos-7-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:centos-7
- - name: amazonlinux-2-2019-2-py2
+ - name: amazonlinux-2-2019-2-py3
driver:
- image: netmanagers/salt-2019.2-py2:amazonlinux-2
+ image: netmanagers/salt-2019.2-py3:amazonlinux-2
- name: arch-base-latest-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:arch-base-latest
@@ -112,6 +114,7 @@ suites:
- ubuntu-1804-2019-2-py3
- centos-8-2019-2-py3
- opensuse-leap-151-2019-2-py3
+ - amazonlinux-2-2019-2-py3
provisioner:
state_top:
base:
@@ -135,7 +138,6 @@ suites:
includes:
- ubuntu-1804-2019-2-py2
- centos-7-2019-2-py2
- - amazonlinux-2-2019-2-py2
- arch-base-latest-2019-2-py2
provisioner:
state_top:
@@ -161,7 +163,7 @@ suites:
- debian-9-2018-3-py2
- ubuntu-1604-2018-3-py2
- centos-7-2018-3-py2
- - amazonlinux-2-2018-3-py2
+ - amazonlinux-1-2018-3-py2
- arch-base-latest-2018-3-py2
provisioner:
state_top:
@@ -187,7 +189,7 @@ suites:
- debian-8-2017-7-py2
- ubuntu-1604-2017-7-py2
- centos-6-2017-7-py2
- - amazonlinux-2-2017-7-py2
+ - amazonlinux-1-2017-7-py2
- arch-base-latest-2017-7-py2
provisioner:
state_top:
diff --git a/salt/cloud.sls b/salt/cloud.sls
index 7d87f24..71ae0d2 100644
--- a/salt/cloud.sls
+++ b/salt/cloud.sls
@@ -1,3 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
{%- if salt_settings.use_pip %}
@@ -34,7 +35,7 @@ salt-cloud:
cloud-cert-{{ cert }}-pem:
file.managed:
- name: {{ salt_settings.config_path }}/pki/cloud/{{ cert }}.pem
- - source: salt://{{ slspath }}/files/key
+ - source: salt://{{ tplroot }}/files/key
- template: jinja
- user: root
- group:
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
index 4c42944..85f53d7 100644
--- a/salt/defaults.yaml
+++ b/salt/defaults.yaml
@@ -3,6 +3,7 @@
---
salt:
version: ''
+ py_ver: '' ## py2 is default
rootuser: root
rootgroup: root
install_packages: true
diff --git a/salt/libtofs.jinja b/salt/libtofs.jinja
index 900e62b..0668925 100644
--- a/salt/libtofs.jinja
+++ b/salt/libtofs.jinja
@@ -16,7 +16,7 @@
'<tplroot>:tofs:files_switch' this is the ordered list of grains to
use as selector switch of the directories under
"<path_prefix>/files"
- * indent_witdh: indentation of the result value to conform to YAML
+ * indent_width: indentation of the result value to conform to YAML
* use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot`
@@ -82,7 +82,7 @@
) %}
{#- Append an empty value to evaluate as `default` in the loop below #}
{%- if '' not in fsl %}
- {%- do fsl.append('') %}
+ {%- set fsl = fsl + [''] %}
{%- endif %}
{%- for fs in fsl %}
{%- for src_file in src_files %}
diff --git a/salt/master.sls b/salt/master.sls
index 2003be3..161ca42 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -45,7 +45,7 @@ salt-master:
}}
{%- else %}
- template: jinja
- - source: salt://{{ slspath }}/files/master.d
+ - source: salt://{{ tplroot }}/files/master.d
{%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
diff --git a/salt/minion.sls b/salt/minion.sls
index 01cbe42..25ff63a 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -92,7 +92,7 @@ salt-minion:
}}
{%- else %}
- template: jinja
- - source: salt://{{ slspath }}/files/minion.d
+ - source: salt://{{ tplroot }}/files/minion.d
- context:
standalone: False
{%- endif %}
diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
index 4c64e98..88d0638 100644
--- a/salt/osfamilymap.yaml
+++ b/salt/osfamilymap.yaml
@@ -2,9 +2,7 @@
# vim: ft=yaml
---
-{%- import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
-{%- set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
-{%- set py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
+{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set osrelease = salt['grains.get']('osrelease') %}
{#- Workaround for OpenSuse Leap 15.1 until the repo is available #}
@@ -26,8 +24,8 @@
{%- endif %}
Debian:
- pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
- key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
+ pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
+ key_url: 'https://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
libgit2: libgit2-22
pyinotify: python-pyinotify
gitfs:
@@ -43,8 +41,8 @@ Debian:
RedHat:
pkgrepo_name: saltstack
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
- pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}'
- key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
+ pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}'
+ key_url: 'https://repo.saltstack.com/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2
python_git: GitPython
gitfs:
@@ -105,14 +103,14 @@ Alpine:
FreeBSD:
rootgroup: wheel
- salt_master: py27-salt
- salt_minion: py27-salt
- salt_syndic: py27-salt
- salt_cloud: py27-salt
- salt_api: py27-salt
- salt_ssh: py27-salt
- python_git: py27-GitPython
- pygit2: py27-pygit2
+ salt_master: {{ py_ver_repr or 'py27' }}-salt
+ salt_minion: {{ py_ver_repr or 'py27' }}-salt
+ salt_syndic: {{ py_ver_repr or 'py27' }}-salt
+ salt_cloud: {{ py_ver_repr or 'py27' }}-salt
+ salt_api: {{ py_ver_repr or 'py27' }}-salt
+ salt_ssh: {{ py_ver_repr or 'py27' }}-salt
+ python_git: {{ py_ver_repr or 'py27' }}-GitPython
+ pygit2: {{ py_ver_repr or 'py27' }}-pygit2
config_path: /usr/local/etc/salt
minion_service: salt_minion
master_service: salt_master
@@ -132,7 +130,7 @@ OpenBSD:
python_git: py-GitPython
Windows:
- salt_minion: salt-minion{{ py_ver_repr }}
+ salt_minion: salt-minion{{ py_ver_repr or '-py3' }}
config_path: 'C:\salt\conf'
minion_service: salt-minion
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index 6bc77ec..6816e96 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -2,9 +2,7 @@
# vim: ft=yaml
---
-{% import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
-{% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
-{% set py_ver_dir = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
+{%- set py_ver_dir = salt['pillar.get']('salt:py_ver', '') %}
{% set osrelease = salt['grains.get']('osrelease') %}
{% set salt_release = salt['pillar.get']('salt:release', 'latest') %}
@@ -22,12 +20,12 @@ Fedora:
Amazon:
pkgrepo_name: saltstack-amzn-repo
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
- pkgrepo: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}'
- key_url: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
+ pkgrepo: 'https://repo.saltstack.com/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}'
+ key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
Ubuntu:
- pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
- key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
+ pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
+ key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2
gitfs:
pygit2:
@@ -37,8 +35,8 @@ Ubuntu:
install_from_package: Null
Raspbian:
- pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
- key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
+ pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
+ key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
SmartOS:
salt_master: salt
@@ -50,7 +48,7 @@ SmartOS:
minion_service: 'salt:minion'
master_service: 'salt:master'
api_service: 'salt:api'
- python_dulwich: 'py27-dulwich'
+ python_dulwich: {{ py_ver_dir or 'py27' }}{{ '-dulwich' }}
gitfs:
dulwich:
install_from_source: false
diff --git a/salt/ospyvermap.yaml b/salt/ospyvermap.yaml
deleted file mode 100644
index 4df2d3d..0000000
--- a/salt/ospyvermap.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-Debian:
- py2: 'apt'
- py3: 'py3'
-
-RedHat:
- py2: 'yum'
- py3: 'py3'
-
-Suse: {}
-
-Gentoo: {}
-
-Arch: {}
-
-Alpine: {}
-
-FreeBSD: {}
-
-OpenBSD: {}
-
-# This is *not* used directly with https://repo.saltstack.com
-# Rather, this is used with `salt-winrepo-ng`, where the package names are:
-# * py2: salt-minion
-# * py3: salt-minion-py3
-Windows:
- py2: ''
- py3: '-py3'
-
-MacOS:
- py2: 'py2'
- py3: 'py3'
diff --git a/salt/ssh.sls b/salt/ssh.sls
index 8f27a77..e81e89e 100644
--- a/salt/ssh.sls
+++ b/salt/ssh.sls
@@ -1,3 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
{% if salt_settings.install_packages %}
@@ -12,7 +13,7 @@ ensure-salt-ssh-is-installed:
ensure-roster-config:
file.managed:
- name: {{ salt_settings.config_path }}/roster
- - source: salt://{{ slspath }}/files/roster.jinja
+ - source: salt://{{ tplroot }}/files/roster.jinja
- template: jinja
{% if salt_settings.install_packages %}
- require:
diff --git a/salt/standalone.sls b/salt/standalone.sls
index daffcec..dd38a5a 100644
--- a/salt/standalone.sls
+++ b/salt/standalone.sls
@@ -1,3 +1,4 @@
+{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
salt-minion:
@@ -11,7 +12,7 @@ salt-minion:
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- - source: salt://{{ slspath }}/files/minion.d
+ - source: salt://{{ tplroot }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- context:
diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index 70fbd00..a4fb073 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ version =
when 'redhat'
case platform[:name]
when 'amazon'
- '2019.2.2-1.el7'
+ '2019.2.3-1.amzn2'
when 'centos'
'2019.2.3-1.el8'
end
diff --git a/test/salt/pillar/v201707-py2.sls b/test/salt/pillar/v201707-py2.sls
index d923400..341c0bf 100644
--- a/test/salt/pillar/v201707-py2.sls
+++ b/test/salt/pillar/v201707-py2.sls
@@ -3,4 +3,3 @@
---
salt:
release: '2017.7'
- py_ver: 'py2'
diff --git a/test/salt/pillar/v201803-py2.sls b/test/salt/pillar/v201803-py2.sls
index 802011c..523ab88 100644
--- a/test/salt/pillar/v201803-py2.sls
+++ b/test/salt/pillar/v201803-py2.sls
@@ -3,4 +3,3 @@
---
salt:
release: '2018.3'
- py_ver: 'py2'
diff --git a/test/salt/pillar/v201902-py2.sls b/test/salt/pillar/v201902-py2.sls
index 8888254..1627a0c 100644
--- a/test/salt/pillar/v201902-py2.sls
+++ b/test/salt/pillar/v201902-py2.sls
@@ -3,4 +3,3 @@
---
salt:
release: '2019.2'
- py_ver: 'py2'