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

Adding Habitization - this PR supersedes PR#1416 #1472

Merged
merged 1 commit into from
Feb 22, 2018

Conversation

jeremymv2
Copy link
Contributor

@jeremymv2 jeremymv2 commented Feb 14, 2018

teamwork

This is the result of a tremendous team effort spent over the last couple of months. I'm just trying to drive it home with this PR. It is a branch copy of #1416; rebased and with all commits squashed and authors
attributed below. #1416 can be left intact for posterity and reference of original work with all the commits.

Habitat pkgs in this branch have been tested and are functional.

The vast majority of changes in this PR are for Habitat only and will not affect any current functionality. The few exceptions to this are some minor changes to files in:

  • omnibus/files/private-chef-ctl-commands/
  • oc-chef-pedant/lib/

Co-authored-by: Elliott Davis edavis@chef.io
Co-authored-by: Irving Popovetsky irving@chef.io
Co-authored-by: Mark Anderson mark@chef.io
Co-authored-by: Nolan Davidson ndavidson@chef.io
Co-authored-by: Thomas Cate thomascate@gmail.com

Signed-off-by: Jeremy J. Miller jm@chef.io

@jeremymv2 jeremymv2 requested a review from a team February 14, 2018 15:28
Copy link
Contributor

@markan markan left a comment

Choose a reason for hiding this comment

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

In general this looks good. I have a similar branch I was working on before going on vacation, but let's go with this one.

My only big reservation surrounds the chef-server-ctl work; AFAIK we don't test that code, and I'm not 100% confident the changes I made are ok in the non-hab environment.

Possibly we should split this into two pieces; the hab work, and the changes to omnibus/files/private-chef-ctl-commands. We could just merge the habitat stuff immediately, while we take the time to spin up some test environments and check the changes to ctl.

Thoughts @jeremymv2 @echohack ?

soft: 65536
hard: 65536
volumes:
- elasticsearch-data:/hab/svc/elasticsearch/data:Z
Copy link
Contributor

Choose a reason for hiding this comment

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

What does the ':Z' do here?

@@ -0,0 +1,45 @@
pkg_name=dbdpg
pkg_origin=frog-hornets-nest
Copy link
Contributor

Choose a reason for hiding this comment

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

?

@jeremymv2
Copy link
Contributor Author

@markan I've broken out the changes to omnibus/files/private-chef-ctl-commands/ into a different PR. Could you re-review please at your convenience?

Copy link
Contributor

@markan markan left a comment

Choose a reason for hiding this comment

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

LGTM

@jeremymv2 jeremymv2 force-pushed the jeremymv2/habitize_the_things branch from 550b795 to 1b0f51f Compare February 21, 2018 20:05
@markan
Copy link
Contributor

markan commented Feb 22, 2018

Let's rebase and squash this down before merging...

This is a branch copy of chef#1416 rebased and with all commits squashed and authors
attributed below.

Co-authored-by: Elliott Davis <edavis@chef.io>
Co-authored-by: Irving Popovetsky <irving@chef.io>
Co-authored-by: Mark Anderson <mark@chef.io>
Co-authored-by: Nolan Davidson <ndavidson@chef.io>
Co-authored-by: Thomas Cate <thomascate@gmail.com>

Signed-off-by: Jeremy J. Miller <jm@chef.io>
@jeremymv2 jeremymv2 force-pushed the jeremymv2/habitize_the_things branch from 010c244 to 1907d74 Compare February 22, 2018 15:10
@jeremymv2 jeremymv2 merged commit de25158 into chef:master Feb 22, 2018
@jeremymv2 jeremymv2 deleted the jeremymv2/habitize_the_things branch February 22, 2018 15:33
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