Advertisement
Guest User

Untitled

a guest
Feb 28th, 2018
84
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.81 KB | None | 0 0
  1. diff --git a/salt/pillar/__init__.py b/salt/pillar/__init__.py
  2. index c113b3502c..6f83abbfeb 100644
  3. --- a/salt/pillar/__init__.py
  4. +++ b/salt/pillar/__init__.py
  5. @@ -146,9 +146,9 @@ class AsyncRemotePillar(RemotePillarMixin):
  6. if pillarenv is not None:
  7. self.opts['pillarenv'] = pillarenv
  8. self.pillar_override = pillar_override or OrderedDict()
  9. - if not isinstance(self.pillar_override, dict):
  10. + if not isinstance(self.pillar_override, OrderedDict):
  11. self.pillar_override = OrderedDict()
  12. - log.error('Pillar data must be a dictionary')
  13. + log.error('Pillar data must be a OrderedDict')
  14. self.extra_minion_data = extra_minion_data or {}
  15. if not isinstance(self.extra_minion_data, dict):
  16. self.extra_minion_data = {}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement