From 82fa86617fcbb59bb93355c1adf853124ca1cb35 Mon Sep 17 00:00:00 2001 From: marcoc Date: Sat, 13 Oct 2018 23:34:30 +0100 Subject: [PATCH 1/2] Fix #50015, Windows grain defaults to physical as unix grain --- salt/grains/core.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/grains/core.py b/salt/grains/core.py index bc4372350371..1a9bb33f19ae 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -445,6 +445,8 @@ def _windows_virtual(osdata): grains = dict() if osdata['kernel'] != 'Windows': return grains + + grains['virtual'] = 'physical' # It is possible that the 'manufacturer' and/or 'productname' grains # exist but have a value of None. From 8129ac6945010fd0e1ba6e3651093cb01716d282 Mon Sep 17 00:00:00 2001 From: marcoc Date: Sun, 14 Oct 2018 21:58:46 +0100 Subject: [PATCH 2/2] removed whitespaces --- salt/grains/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grains/core.py b/salt/grains/core.py index 1a9bb33f19ae..0f99b4a7f5fb 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -445,7 +445,7 @@ def _windows_virtual(osdata): grains = dict() if osdata['kernel'] != 'Windows': return grains - + grains['virtual'] = 'physical' # It is possible that the 'manufacturer' and/or 'productname' grains