Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 'consul reload' on custom rpc port #179

Merged
merged 3 commits into from
Aug 25, 2015

Conversation

mdelagrange
Copy link
Contributor

Similar to #173.

@@ -13,6 +13,9 @@
exec { 'reload consul service':
path => [$consul::bin_dir,'/bin','/usr/bin'],
command => 'consul reload',
environment => [
"CONSUL_RPC_ADDR=${consul::rpc_addr}:${consul::rpc_port}",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just do this as part of the command?

command => "consul reload -rpc-addr=${consul::rpc_addr}:${consul::rpc_port}",

@mdelagrange
Copy link
Contributor Author

@ericpfisher pointed out that, if we used the environment variable rather than the flag, we could probably make the init scripts cleaner.

@aj-jester
Copy link

@mdelagrange Can we add a test for the elsif? https://github.com/solarkennedy/puppet-consul/blob/master/manifests/init.pp#L133

Also it would be awesome, but not required, if we can add a test for the sysv (your previous PR) for this elsif conditional as well. I'll do the same for upstart 😄.

if we used the environment variable rather than the flag, we could probably make the init scripts cleaner.

Hmmm perhaps but I prefer if we are explicit with the flag since this module is used across various systems and I don't want something to fail because of an env var issue 😕

@mdelagrange
Copy link
Contributor Author

OK

@mdelagrange
Copy link
Contributor Author

All set.

@aj-jester
Copy link

@mdelagrange this looks great 👍

🚄 LGTM

@solarkennedy
Copy link
Contributor

Thanks!

solarkennedy added a commit that referenced this pull request Aug 25, 2015
fix 'consul reload' on custom rpc port
@solarkennedy solarkennedy merged commit 8cd0af1 into voxpupuli:master Aug 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants