Correct supermarket config file in product_matrix #31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As a user I would like to use `chef_ingredient` and setup my supermarket server passing my configuration through the `config` attribute so I don't have to use other methods like a `template` or `file` resources to lay down my configuration. **Solution** This commit modified the `product_matrix` pointing to the right `config-file` for supermarket that is `/etc/supermarket/supermarket.json` Closes #30
|
cc/ @jtimberman @sersut |
jtimberman
added a commit
that referenced
this pull request
Aug 13, 2015
…file Correct supermarket config file in product_matrix
wrightp
pushed a commit
that referenced
this pull request
Apr 26, 2017
…nd helpers into Chef Ingredient (https://github.com/chef-cookbooks/chef-ingredient) Specific files were selected in their entirety versus merging the chef_stack repo to keep the commits clean and avoid conflicts. Background Chef Stack is a series of primitives for installing, configuring, and managing over time all of Chef's products. Its intention is to be very prescriptive about how Chef's software stack is configured and maintained, while being very non-prescriptive about how its deployed, or where its configuration comes from. It was born out of a Customer need to focus on the complexities of their environment, without having to focus on Chef's core software. Moving the management of Chef's software to easy-to-consume primitives allows the Customer to focus on the things that are important to them -- their environment and their workflow. Contributions Special Thanks to Edmund DeSmet <edesmet@its.jnj.com> who heavily influenced the design of Chef Stack. andy-dufour <adufour@chef.io> (10): Fixing push jobs client config Fix Issue #5: Run delivery token before delivery api so output is only JSON Version bump Adding non-standard platform support Adding platform options to client resource Adding readme Fixing formating Fixing spacing Adding descriptions to custom resources Fixing some formatting Brandon Raabe <brandon.raabe@newcontext.com> (3): Fix tables in the readme Remove default value of `nil` Fix regex to determine if source is a URI Jeremy J. Miller <jm@chef.io> (5): adding package_source to automate resource changing property_is_set call adding second guard for resource fixing 'source is required' error Merge pull request #10 from itmustbejj/wip Josh Hudson <jhudson@chef.io> (20): Merge pull request #6 from andy-dufour/ad/v2-runner-token-fix Move write_vault to helpers Update write_vault to reflect renamed cookbook Add gather_secrets action for chef_backend resource. Use node['chef_stack']['admin'] defaulted to workflow instead of hardcoded string in write_vault function Implement read_vault helper function Change the location of the chef vault encryption key Use an attribute to determine the client key Default chef_backend_secrets to nil Don't have non-bootstrap try to join-cluster if they already have. Allow :chef_config_file property for wf_builder resource instead of hardcoding /etc/chef/client.rb Don't explicitly pass in node name when tagging runner Use Chef::Config['node_name'] instead of node['fqdn'] in wf_builder resource Reverting a bunch of changes we didn't need to make Don't write chef-backend-secrets.json if it's not set (bootstrap) Revert partial implementation of package_source property for resources for another feature branch. Fix chef_backend_secrets property for use case of bootstrap backend generating it's own secrets. Lint and syntax fixes Merge pull request #11 from ncerny/fix_source Merge pull request #15 from andy-dufour/ad/multi_platform Nathan Cerny <ncerny@chef.io> (55): Add generated delivery configuration Add generated cookbook content Add generated delivery build cookbook Merge branch 'add-delivery-configuration' Initial build out of cookbook for managing Chef-Client, Chef-Server, and Chef-Automate. Update v1 build node search string to delivery-build-node to better match legacy workflows. Supermarket recipe and tweaks for performance and workflow. Move client config to shared recipe, and update all components to latest. cleanup and switch all components to latest Fix issues with spinning up fresh cluster. Create directory and place config before reconfigure of automate so nginx picks up config. Bug fixes. Add initial chef-backend resource and recipe Fix bug with key on chef_user resource. Same bug in chef_org Be consistent in declaration of new_resource in chef_user Pull client.rb template from this cookbook. Rename 'key' to 'key_path' to be more explicit. Lay down validation pem in install, if it's set. property error - test if new_resource works in this context. Lazy-load contents of delivery-cmd for v2 builders. Ensure authorized_keys file exists for v2 job runner. Enterprise should be configurable in workflow_builder. Merge pull request #1 from andy-dufour/ad/push_jobs_config Rename Cookbook to chef_stack Merge pull request #2 from ncerny/nc/rename-cookbook Move ensurekv to helpers to avoid duplication. Testing should be done with chef-services Merge pull request #3 from ncerny/nc/cleanup Merge pull request #4 from ncerny/lauck/fix_cookbook_name Merge pull request #16 from andy-dufour/ad/add_readme Merge pull request #18 from brandocorp-cookbooks/chef-backend-secrets-deprecation Merge pull request #17 from brandocorp-cookbooks/readme-fixes Version Bump for PRs - fix deprecation on chef_backend, and fix README tables. Switch chef_backend to use peers instead of bootstrap. Change chef-backend-secrets to default to empty string. suppress error messages in chef-backend guard Fix lint failures. Remove old delivery configuration. Merge pull request #23 from ncerny/nc/remove-delivery Remove old .chef directory. Merge pull request #24 from ncerny/nc/remove-chef Merge branch 'master' into nc/fix-lints Default chef_file source to chef_file if source property is not set. Fix incorrect log_location in wf_builder. Version bump - 0.8.0 - Clear up ambiguous versions Merge pull request #26 from ncerny/nc/fix-source-req-error Merge branch 'master' into nc/wf-log-bug Merge pull request #25 from ncerny/nc/wf-log-bug Merge branch 'master' into nc/fix-lints Merge pull request #21 from ncerny/nc/fix-lints Merge branch 'master' into nc/allow-backend-peers Merge pull request #19 from ncerny/nc/allow-backend-peers Merge pull request #31 from brandocorp-cookbooks/chef-file-regex Release 0.8.1 Stephen Lauck <lauck@chef.io> (1): Rename cookbook chef to chef_stack in client resource Signed-off-by: Patrick Wright <patrick@chef.io>
wrightp
pushed a commit
that referenced
this pull request
Apr 27, 2017
…nd helpers into Chef Ingredient (https://github.com/chef-cookbooks/chef-ingredient) Specific files were selected in their entirety versus merging the chef_stack repo to keep the commits clean and avoid conflicts. Background Chef Stack is a series of primitives for installing, configuring, and managing over time all of Chef's products. Its intention is to be very prescriptive about how Chef's software stack is configured and maintained, while being very non-prescriptive about how its deployed, or where its configuration comes from. It was born out of a Customer need to focus on the complexities of their environment, without having to focus on Chef's core software. Moving the management of Chef's software to easy-to-consume primitives allows the Customer to focus on the things that are important to them -- their environment and their workflow. Contributions Special Thanks to Edmund DeSmet <edesmet@its.jnj.com> who heavily influenced the design of Chef Stack. andy-dufour <adufour@chef.io> (10): Fixing push jobs client config Fix Issue #5: Run delivery token before delivery api so output is only JSON Version bump Adding non-standard platform support Adding platform options to client resource Adding readme Fixing formating Fixing spacing Adding descriptions to custom resources Fixing some formatting Brandon Raabe <brandon.raabe@newcontext.com> (3): Fix tables in the readme Remove default value of `nil` Fix regex to determine if source is a URI Jeremy J. Miller <jm@chef.io> (5): adding package_source to automate resource changing property_is_set call adding second guard for resource fixing 'source is required' error Merge pull request #10 from itmustbejj/wip Josh Hudson <jhudson@chef.io> (20): Merge pull request #6 from andy-dufour/ad/v2-runner-token-fix Move write_vault to helpers Update write_vault to reflect renamed cookbook Add gather_secrets action for chef_backend resource. Use node['chef_stack']['admin'] defaulted to workflow instead of hardcoded string in write_vault function Implement read_vault helper function Change the location of the chef vault encryption key Use an attribute to determine the client key Default chef_backend_secrets to nil Don't have non-bootstrap try to join-cluster if they already have. Allow :chef_config_file property for wf_builder resource instead of hardcoding /etc/chef/client.rb Don't explicitly pass in node name when tagging runner Use Chef::Config['node_name'] instead of node['fqdn'] in wf_builder resource Reverting a bunch of changes we didn't need to make Don't write chef-backend-secrets.json if it's not set (bootstrap) Revert partial implementation of package_source property for resources for another feature branch. Fix chef_backend_secrets property for use case of bootstrap backend generating it's own secrets. Lint and syntax fixes Merge pull request #11 from ncerny/fix_source Merge pull request #15 from andy-dufour/ad/multi_platform Nathan Cerny <ncerny@chef.io> (55): Add generated delivery configuration Add generated cookbook content Add generated delivery build cookbook Merge branch 'add-delivery-configuration' Initial build out of cookbook for managing Chef-Client, Chef-Server, and Chef-Automate. Update v1 build node search string to delivery-build-node to better match legacy workflows. Supermarket recipe and tweaks for performance and workflow. Move client config to shared recipe, and update all components to latest. cleanup and switch all components to latest Fix issues with spinning up fresh cluster. Create directory and place config before reconfigure of automate so nginx picks up config. Bug fixes. Add initial chef-backend resource and recipe Fix bug with key on chef_user resource. Same bug in chef_org Be consistent in declaration of new_resource in chef_user Pull client.rb template from this cookbook. Rename 'key' to 'key_path' to be more explicit. Lay down validation pem in install, if it's set. property error - test if new_resource works in this context. Lazy-load contents of delivery-cmd for v2 builders. Ensure authorized_keys file exists for v2 job runner. Enterprise should be configurable in workflow_builder. Merge pull request #1 from andy-dufour/ad/push_jobs_config Rename Cookbook to chef_stack Merge pull request #2 from ncerny/nc/rename-cookbook Move ensurekv to helpers to avoid duplication. Testing should be done with chef-services Merge pull request #3 from ncerny/nc/cleanup Merge pull request #4 from ncerny/lauck/fix_cookbook_name Merge pull request #16 from andy-dufour/ad/add_readme Merge pull request #18 from brandocorp-cookbooks/chef-backend-secrets-deprecation Merge pull request #17 from brandocorp-cookbooks/readme-fixes Version Bump for PRs - fix deprecation on chef_backend, and fix README tables. Switch chef_backend to use peers instead of bootstrap. Change chef-backend-secrets to default to empty string. suppress error messages in chef-backend guard Fix lint failures. Remove old delivery configuration. Merge pull request #23 from ncerny/nc/remove-delivery Remove old .chef directory. Merge pull request #24 from ncerny/nc/remove-chef Merge branch 'master' into nc/fix-lints Default chef_file source to chef_file if source property is not set. Fix incorrect log_location in wf_builder. Version bump - 0.8.0 - Clear up ambiguous versions Merge pull request #26 from ncerny/nc/fix-source-req-error Merge branch 'master' into nc/wf-log-bug Merge pull request #25 from ncerny/nc/wf-log-bug Merge branch 'master' into nc/fix-lints Merge pull request #21 from ncerny/nc/fix-lints Merge branch 'master' into nc/allow-backend-peers Merge pull request #19 from ncerny/nc/allow-backend-peers Merge pull request #31 from brandocorp-cookbooks/chef-file-regex Release 0.8.1 Stephen Lauck <lauck@chef.io> (1): Rename cookbook chef to chef_stack in client resource Signed-off-by: Patrick Wright <patrick@chef.io> Signed-off-by: Patrick Wright <patrick@chef.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As a user I would like to use
chef_ingredientand setup my supermarket server passing my configuration through theconfigattribute so I don't have to use other methods like atemplateorfileresources to lay down my configuration.Solution
This commit modified the
product_matrixpointing to the rightconfig-filefor supermarket that is/etc/supermarket/supermarket.jsonCloses #30