Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
- index c113b3502c..6f83abbfeb 100644
- --- a/salt/pillar/__init__.py
- +++ b/salt/pillar/__init__.py
- @@ -146,9 +146,9 @@ class AsyncRemotePillar(RemotePillarMixin):
- if pillarenv is not None:
- self.opts['pillarenv'] = pillarenv
- self.pillar_override = pillar_override or OrderedDict()
- - if not isinstance(self.pillar_override, dict):
- + if not isinstance(self.pillar_override, OrderedDict):
- self.pillar_override = OrderedDict()
- - log.error('Pillar data must be a dictionary')
- + log.error('Pillar data must be a OrderedDict')
- self.extra_minion_data = extra_minion_data or {}
- if not isinstance(self.extra_minion_data, dict):
- self.extra_minion_data = {}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement