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

Resource improvements #10

Merged
merged 20 commits into from
Feb 21, 2017
Merged

Resource improvements #10

merged 20 commits into from
Feb 21, 2017

Conversation

itmustbejj
Copy link
Collaborator

  • Added guards to several resource actions.
  • Changed order of operations for backend resource, so you could provide a chef_backend_secrets before creating a cluster, if desired.
  • Replaced some hardcoded references to /etc/chef/client.rb with a property that defaults to that value.
  • Replaced some references of node['fqdn'] with Chef::Config['node_name'] to support use cases where the node_name is not the fqdn. This builds on the cookbook's assumption that all these nodes are also clients (of chef-solo/zero or another chef server).

Josh Hudson and others added 20 commits February 2, 2017 10:30
Move write_vault to helpers
dbe36fd
Update write_vault to reflect renamed cookbook
405e0ee
Add gather_secrets action for chef_backend resource.
1c630a8
Use node['chef_stack']['admin'] defaulted to workflow instead of hard…
3c466c2 
…coded string in write_vault function
Implement read_vault helper function
26a8d9d
Change the location of the chef vault encryption key
4b386d8
Use an attribute to determine the client key
d11e159
Default chef_backend_secrets to nil
19c04c4
Don't have non-bootstrap try to join-cluster if they already have.
dd85e11 
Signed-off-by: Josh Hudson <jhudson@chef.io>
Allow :chef_config_file property for wf_builder resource instead of h…
59dfb7d 
…ardcoding /etc/chef/client.rb

Signed-off-by: Josh Hudson <jhudson@chef.io>
Don't explicitly pass in node name when tagging runner
68ac513 
Signed-off-by: Josh Hudson <jhudson@chef.io>
Use Chef::Config['node_name'] instead of node['fqdn'] in wf_builder r…
219bc5b 
…esource

Signed-off-by: Josh Hudson <jhudson@chef.io>
@jeremymv2
adding package_source to automate resource
f283611 
Signed-off-by: Jeremy J. Miller <jm@chef.io>
@jeremymv2
changing property_is_set call
d3c6f92 
Signed-off-by: Jeremy J. Miller <jm@chef.io>
@jeremymv2
adding second guard for resource
a2b92b9 
Signed-off-by: Jeremy J. Miller <jm@chef.io>
Reverting a bunch of changes we didn't need to make
a530825 
Signed-off-by: Josh Hudson <jhudson@chef.io>
Don't write chef-backend-secrets.json if it's not set (bootstrap)
843e895 
Signed-off-by: Josh Hudson <jhudson@chef.io>
Revert partial implementation of package_source property for resource…
f968e40 
…s for another feature branch.

Signed-off-by: Josh Hudson <jhudson@chef.io>
Fix chef_backend_secrets property for use case of bootstrap backend g…
e6a03f7 
…enerating it's own secrets.

Signed-off-by: Josh Hudson <jhudson@chef.io>
Lint and syntax fixes
eb8cbd1 
Signed-off-by: Josh Hudson <jhudson@chef.io>
@jeremymv2
Copy link
Collaborator

👍

@jeremymv2 jeremymv2 merged commit 47165ec into ncerny:master Feb 21, 2017
@jeremymv2 jeremymv2 deleted the wip branch February 21, 2017 20:50
@itmustbejj itmustbejj mentioned this pull request Mar 7, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@itmustbejj @jeremymv2