future parser compatibility #68
Conversation
Signed-off-by: Pavel Pulec <[email protected]>
pulecp
force-pushed
the
master
branch
2 times, most recently
from
2398be0 to
562273a
Compare
manifests/server.pp
Outdated
| @@ -29,7 +29,7 @@ | |||
| $ips = false, # an optional list of ip's for each in hosts[] | |||
| $clients = [] # list of allowed client ip's # TODO: get from exported resources | |||
| ) { | |||
| $FW = '$FW' # make using $FW in shorewall easier | |||
| $fw = '$fw' # make using $fw in shorewall easier | |||
There was a problem hiding this comment.
Haven't reviewed the whole patch, but this is obviously incorrect, meaning you probably did a quick search/replace. Could you fix this and have a quick look through the whole patch? Thanks!
… parser compatibility) Signed-off-by: Pavel Pulec <[email protected]>
|
True, I simply renamed couple of variables and didn't noticed that a variable name is the same as a content :). I fixed it. |
| @@ -29,7 +29,7 @@ | |||
| $ips = false, # an optional list of ip's for each in hosts[] | |||
| $clients = [] # list of allowed client ip's # TODO: get from exported resources | |||
| ) { | |||
| $FW = '$FW' # make using $FW in shorewall easier | |||
| $fw = '$FW' # make using $FW in shorewall easier | |||
There was a problem hiding this comment.
Is there a reason to use a lowercase varname? Is it required in puppet 4? The reason I left it as caps is that this way the shorewall rules are perfectly readable as folks are used to them.
There was a problem hiding this comment.
The goal of my patch was to fix those errors when you check the code with enabled future parser:
Error: Node inheritance is not supported in Puppet >= 4.0.0. See http://links.puppetlabs.com/puppet-node-inheritance-deprecation at ./modules/gluster/vagrant/puppet/manifests/site.pp:10:22
Error: Node inheritance is not supported in Puppet >= 4.0.0. See http://links.puppetlabs.com/puppet-node-inheritance-deprecation at ./modules/gluster/vagrant/puppet/manifests/site.pp:41:28
Error: Node inheritance is not supported in Puppet >= 4.0.0. See http://links.puppetlabs.com/puppet-node-inheritance-deprecation at ./modules/gluster/vagrant/puppet/manifests/site.pp:108:29
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:137:2
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:182:22
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:183:22
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:187:23
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:188:22
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:189:22
Error: Illegal variable name, The given name 'FW' does not conform to the naming rule /^((::)?[a-z]\w*)*((::)?[a-z_]\w*)$/ at ./modules/gluster/vagrant/puppet/manifests/site.pp:193:15
Error: Found 11 errors. Giving up
So yes, they are not allowed in future versions of puppet.
Signed-off-by: Pavel Pulec <[email protected]>
|
I also made one more change. File modes have to be defined as a string. |
|
@pulecp Want to be added as a maintainer? |
|
@purpleidea it might be fine even when I don't puppetize gluster nowadays. |
|
@pulecp Please excuse the delay. You've been added as a collaborator. Please only use fast-forward merges. (No merge commits.) Any major changes, please ping me before merging. Thanks! |
No description provided.