Merge pull request #62926 from garethgreenaway/62914_remove_manufactu…

…re_grain Removing manufacture grain which has been deprecated
saltstack · Oct 20, 2022 · 9e9bf74 · 9e9bf74
2 parents 75a6ffd + e5c2262
commit 9e9bf74
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/changelog/62914.deprecated b/changelog/62914.deprecated
@@ -0,0 +1 @@
+Removing manufacture grain which has been deprecated.
diff --git a/salt/grains/core.py b/salt/grains/core.py
@@ -3180,8 +3180,6 @@ def _hw_data(osdata):
             res = regex.search(data)
             if res and len(res.groups()) >= 1:
                 grains["manufacturer"] = res.group(1).strip().replace("'", "")
-                # Remove manufacture in Sulfur: salt.utils.versions.warn_until("Sulfur")
-                grains["manufacture"] = grains["manufacturer"]
                 break
 
         for regex in product_regexes:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Removing manufacture grain which has been deprecated.