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.

Sign up for GitHub

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

Jump to bottom

Consul 0.7.5 & Windows Fixes #421

Merged
merged 7 commits into from
Apr 23, 2017
Merged

Consul 0.7.5 & Windows Fixes #421

merged 7 commits into from
Apr 23, 2017

Conversation

Ginja
Copy link
Contributor

@Ginja Ginja commented Mar 23, 2017

  • Bump default version to 0.7.5
  • Fixed upgrading issue on Windows
    • The NSSM service would not use the new binary location
    • Added extends to certain resources to ensure we're using the Consul Cookbook helper methods
  • Added SHELL environment variable to default_environment hash
    • To make it easier to troubleshoot why script checks don't fire when consul is launched with systemd
  • Re-enabled the Windows Service spec tests as they seem to work locally for me now

@codecov-io
Copy link

codecov-io commented Mar 23, 2017 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@b31d1e7). Click here to learn what that means.
The diff coverage is 23.07%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #421   +/-   ##
=========================================
  Coverage          ?   61.97%           
=========================================
  Files             ?        7           
  Lines             ?      355           
  Branches          ?        0           
=========================================
  Hits              ?      220           
  Misses            ?      135           
  Partials          ?        0
Impacted Files Coverage Δ
libraries/consul_service_windows.rb 23.72% <20%> (ø)
libraries/consul_service.rb 56.25% <25%> (ø)
libraries/helpers.rb 47.36% <25%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b31d1e7...cb8974d. Read the comment docs.

legal90
legal90 reviewed Mar 23, 2017
View reviewed changes
libraries/consul_service.rb Outdated
@@ -55,6 +55,7 @@ def default_environment
{
'GOMAXPROCS' => [node['cpu']['total'], 2].max.to_s,
'PATH' => '/usr/local/bin:/usr/bin:/bin',
'SHELL' => node['consul']['service_shell'],

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

@Ginja Ginja changed the title Various fixes Consul 0.7.5 & Windows Fixes Mar 24, 2017
@legal90
Copy link
Contributor

legal90 commented Apr 11, 2017 •
edited
Loading

@Ginja Could you please also fix the cookstyle offense?
https://travis-ci.org/johnbellone/consul-cookbook/jobs/220580777#L504-L506

@legal90 legal90 modified the milestone: v3.0.0 Apr 11, 2017
@Ginja @legal90
Bumped default version to 0.7.5
dca9fbf
@Ginja @legal90
Fixed upgrading on Windows bug
9dbe7e4 
NSSM would not use the new binary when consul
was upgraded.
Added extends to certain resources to ensure
we're using our helper methods in these resources
@Ginja @legal90
Added SHELL environment variable
5ba16a8 
By default, the consul's user shell is set to
/bin/nologin or /bin/false which prevents script
checks from executing with systemd. This change
is to display this information to make
troubleshooting easier/faster.
@Ginja @legal90
Re-enabled Windows Service Spec Tests
fff982a 
They seem to work locally
@Ginja @legal90
Updated consul version for integration tests
168715f
@Ginja @legal90
Added conditional for environment vars
1a1ee05
@Ginja @legal90
Fix style offense
cb8974d
@legal90
Copy link
Contributor

legal90 commented Apr 23, 2017

@Ginja Thank you! I've rebased your branch in order to fix merge conflict.
TravisCI failure should be fixed by #424

@legal90 legal90 merged commit d1a4af3 into sous-chefs:master Apr 23, 2017
@Ginja
Copy link
Contributor Author

Ginja commented Apr 23, 2017

Thanks, @legal90!

@knightorc knightorc deleted the various-fixes branch June 6, 2018 23:05
@lock
Copy link

lock bot commented Apr 25, 2020

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Apr 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@legal90 legal90 legal90 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ginja @codecov-io @legal90