Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379569 )
Change subject: Convert to use of the future parser by default
......................................................................
Convert to use of the future parser by default
Also, leave out the future filter and the other hacks we had to do to
allow two different parsers to coexist.
Bug: T171704
Change-Id: I51b4704d9e2c038d090f0bc171a24cf5324a1745
---
M puppet_compiler/differ.py
M puppet_compiler/puppet.py
M puppet_compiler/worker.py
M setup.py
4 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/puppet-compiler
refs/changes/69/379569/1
diff --git a/puppet_compiler/differ.py b/puppet_compiler/differ.py
index f0d8d0e..b9c9a71 100644
--- a/puppet_compiler/differ.py
+++ b/puppet_compiler/differ.py
@@ -42,10 +42,7 @@
self.source = None
# Let's first look for special
for k, v in kwargs.items():
- # Filter out null values
- if v is None:
- pass
- elif k == 'content':
+ if k == 'content':
self.content = v
else:
self.parameters[k] = self._filter(v)
diff --git a/puppet_compiler/puppet.py b/puppet_compiler/puppet.py
index 6cd5614..c114e8f 100644
--- a/puppet_compiler/puppet.py
+++ b/puppet_compiler/puppet.py
@@ -26,7 +26,9 @@
'--confdir=%s' % srcdir,
'--trusted_node_data',
'--compile=%s' % hostname,
- '--color=false'
+ '--color=false',
+ '--parser=future',
+ '--manifest=$confdir/manifests'
]
cmd.extend(extra_flags)
return (cmd, env)
diff --git a/puppet_compiler/worker.py b/puppet_compiler/worker.py
index 9c695b0..9dcbc24 100644
--- a/puppet_compiler/worker.py
+++ b/puppet_compiler/worker.py
@@ -29,7 +29,7 @@
self._envs = ['prod', 'change']
self.hostname = hostname
self.diffs = None
- self.resource_filter = future_filter
+ self.resource_filter = None
def facts_file(self):
""" Finds facts file for the current hostname """
diff --git a/setup.py b/setup.py
index e3f4083..170eaba 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name='puppet_compiler',
- version='0.3.3',
+ version='0.3.4',
description='Tools to compile puppet catalogs as a service',
author='Joe',
author_email='[email protected]',
--
To view, visit https://gerrit.wikimedia.org/r/379569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51b4704d9e2c038d090f0bc171a24cf5324a1745
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
