Merge pull request #55592 from Ch3LL/issue_49414

Add deprecation warning path for glance state and execution module
saltstack · Dec 20, 2019 · 8313598 · 8313598
2 parents b4887f9 + 59673bd
commit 8313598
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/salt/modules/glance.py b/salt/modules/glance.py
@@ -104,7 +104,7 @@ def _auth(profile=None, api_version=2, **connection_args):
     Only intended to be used within glance-enabled modules
     '''
     __utils__['versions.warn_until'](
-        'Neon',
+        'Aluminium',
         (
             'The glance module has been deprecated and will be removed in {version}.  '
             'Please update to using the glanceng module'

diff --git a/salt/states/glance.py b/salt/states/glance.py
@@ -94,6 +94,13 @@ def image_present(name, visibility='public', protected=None,
       - disk_format ('raw' (default), 'vhd', 'vhdx', 'vmdk', 'vdi', 'iso',
         'qcow2', 'aki', 'ari' or 'ami')
     '''
+    __utils__['versions.warn_until'](
+        'Aluminium',
+        (
+            'The glance state module has been deprecated and will be removed in {version}.  '
+            'Please update to using the glance_image state module'
+        ),
+    )
     ret = {'name': name,
             'changes': {},
             'result': True,

diff --git a/salt/version.py b/salt/version.py
@@ -108,8 +108,8 @@ class SaltStackVersion(object):
         'Neon'          : (MAX_SIZE - 99, 0),
         'Sodium'        : (MAX_SIZE - 98, 0),
         'Magnesium'     : (MAX_SIZE - 97, 0),
+        'Aluminium'     : (MAX_SIZE - 96, 0),
         # pylint: disable=E8265
-        #'Aluminium'    : (MAX_SIZE - 96, 0),
         #'Silicon'      : (MAX_SIZE - 95, 0),
         #'Phosphorus'   : (MAX_SIZE - 94, 0),
         #'Sulfur'       : (MAX_SIZE - 93, 0),