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

Some linting fixes and resolves joining wan not actually joining the wan #66

Merged
merged 2 commits into from
Jan 23, 2015

Conversation

justicel
Copy link

No description provided.

@solarkennedy
Copy link
Contributor

Whoa!

@solarkennedy
Copy link
Contributor

Can you paste the actual output of consul members -wan -detailed ?

It's certainly possible we've been wrong this whole time, but I would like to see your output to confirm.

@justicel
Copy link
Author

Here are two entries from two different clusters:

web1east.east 10.30.0.13:8302 alive role=consul,dc=east,vsn=2,vsn_min=1,vsn_max=2,build=0.4.1:,port=8300,expect=3
background3.west 10.20.0.48:8302 alive build=0.4.1:,port=8300,expect=3,role=consul,dc=west,vsn=2,vsn_min=1,vsn_max=2

Essentially if the data-center that the server is in isn't attached to the remote data-center there will be no entries returned by the -vP grep which will then generate an exit 1 code which runs the exec command, thus is must be an 'unless' statement. Trust me, I tested the exit results thoroughly.

@solarkennedy
Copy link
Contributor

Ok. Can you rebase without the init style changes and only have the wan-join thing?

@justicel
Copy link
Author

I can remove those but I suggest leaving them. They are lint fixes as you are not supposed to use selectors inside of resource definitions. I can link to the puppet documentation on this point if you'd like.

@solarkennedy
Copy link
Contributor

Ah nevermind. Ship!

@justicel
Copy link
Author

Will you be merging this or is there changes still outstanding you'd like me to make?

@solarkennedy
Copy link
Contributor

Yes, please rebase on master so I can click the merge button.

@solarkennedy
Copy link
Contributor

@EvanKrall do you have a second opinion? How was wan joining working for us this time?

@EvanKrall
Copy link
Contributor

I haven't bumped our puppet-consul module in a long time (since before wan joining was added), and our profile_consul handles wan joining.

This lg2m.

* https://github.com/solarkennedy/puppet-consul:
  Add in a couple of missing test assertions
  Add support for providing watches/checks/services via hiera into the consul class
  Update install.pp
  Adding ability to disable managing of the service
  removed redundant facts in spec tests
  Fixed tests
  Better version checks for OS

Conflicts:
	manifests/run_service.pp
@justicel
Copy link
Author

Okay, should be good to go now.

solarkennedy added a commit that referenced this pull request Jan 23, 2015
Some linting fixes and resolves joining wan not actually joining the wan
@solarkennedy solarkennedy merged commit 6c51f45 into voxpupuli:master Jan 23, 2015
@solarkennedy
Copy link
Contributor

Whew! Thanks.

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