Merge pull request #29 from dmurphy18/amzn_cloud_support

Update Python 3 platform support
saltstack · Dec 15, 2018 · 57ef24c · 57ef24c
2 parents 428346e + 8d96eb7
commit 57ef24c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/file_roots/auto_setup/setup_salt-pack-debian.sls b/file_roots/auto_setup/setup_salt-pack-debian.sls
@@ -9,9 +9,11 @@
 {% if build_py3 %}
 {% set py_ver = 'py3' %}
 {% set changelog_text_py_ver = ' for Python 2 and Python 3' %}
+{% set debian_supported = ['debian9'] %}
 {% else %}
 {% set py_ver = 'py2' %}
 {% set changelog_text_py_ver = ' for Python 2' %}
+{% set debian_supported = ['debian9', 'debian8'] %}
 {% endif %}
 
 
@@ -39,7 +41,6 @@
 {% set specific_user = pillar.get( 'specific_name_user', 'saltstack') %}
 {% set spec_file_tarball = 'salt_debian.tar.xz' %}
 
-{% set debian_supported = ['debian9', 'debian8'] %}
 
 {% for debian_ver in debian_supported %}
 

diff --git a/file_roots/auto_setup/setup_salt-pack-ubuntu.sls b/file_roots/auto_setup/setup_salt-pack-ubuntu.sls
@@ -10,9 +10,11 @@
 {% if build_py3 %}
 {% set py_ver = 'py3' %}
 {% set changelog_text_py_ver = ' for Python 2 and Python 3' %}
+{% set ubuntu_supported = ['ubuntu1804', 'ubuntu1604'] %}
 {% else %}
 {% set py_ver = 'py2' %}
 {% set changelog_text_py_ver = ' for Python 2' %}
+{% set ubuntu_supported = ['ubuntu1804', 'ubuntu1604', 'ubuntu1404'] %}
 {% endif %}
 
 {% if base_cfg.build_specific_tag %}
@@ -40,7 +42,6 @@
 
 {% set spec_file_tarball = 'salt_ubuntu.tar.xz' %}
 
-{% set ubuntu_supported = ['ubuntu1804', 'ubuntu1604', 'ubuntu1404'] %}
 
 {% for ubuntu_ver in ubuntu_supported %}