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 web_ui installation on Consul 0.6.0 and greater #208

Merged
merged 1 commit into from
Dec 17, 2015

Conversation

dbeckham
Copy link
Contributor

The web_ui distribution file in Consul 0.6.0 no longer has a dist/ directory as part of the archive's path. This change adds support web_ui archives for versions >= 0.6.0 as well as maintain compatibility with the older releases. It also fixes a specific issue where the generic consul_web_ui.zip file name would block upgrades to newer versions. I've also updated existing tests, and written new tests for the version check.

If you think the version check in install.pp could be clearer, or if there is anything else you would prefer to be done differently, let me know and I'll be glad to update it.

Added Consul version to the web_ui staged file so that upgrades will
work without having to delete the old staged file first.

Added a version check to handle changes in the 0.6.0 version of the
web_ui distribution file that break installation.
@bjoernhaeuser
Copy link

Hit the same problem :-) Code looks good to me!

@hopperd
Copy link
Contributor

hopperd commented Dec 17, 2015

Thanks @dbeckham this looks pretty good to me! I know versioncmp can be flaky but I think it is the only real good way to do it, as that is what package uses under the hood now so hopefully it is more stable these days.

hopperd added a commit that referenced this pull request Dec 17, 2015
Fix web_ui installation on Consul 0.6.0 and greater
@hopperd hopperd merged commit a84e75c into voxpupuli:master Dec 17, 2015
gozer added a commit to gozer/nubis-consul that referenced this pull request Dec 19, 2015
limed added a commit to nubisproject/nubis-consul that referenced this pull request Dec 19, 2015
Pin at a version of solarkennedy/puppet-consul that includes voxpupuli/puppet-consul#208
JayH5 added a commit to praekeltfoundation/seed-stack that referenced this pull request Jan 6, 2016
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