Adds tenant and tentanttag support #61
Merged
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
spuder
force-pushed
the
feature/tenant
branch
from
5831a6b
to
b7b4097
Compare
| @@ -150,6 +150,8 @@ | |||
| environment = new_resource.environment | |||
| config_path = new_resource.config_path | |||
| service_name = service_name(instance) | |||
| tenant = new_resource.tenant | |||
spuder
force-pushed
the
feature/tenant
branch
from
6acbc58
to
97e1a81
Compare
| @@ -37,3 +37,5 @@ | |||
| attribute :api_key, kind_of: String | |||
| attribute :roles, kind_of: Array | |||
| attribute :environment, kind_of: String, default: node.chef_environment | |||
| attribute :tenants, kind_of: Array, default: nil | |||
There was a problem hiding this comment.
why not default to empty array? If we default them to empty array the other PR actualy isn't needed
There was a problem hiding this comment.
I tried empty array initially. Gives a deprecation warning
Deprecated features used!
An attempt was made to change tenant_tags from [] to nil by calling tenant_tags(nil). In Chef 12, this does a get rather than a set. In Chef 13, this will change to set the value to nil. at 1 location:
- C:/Users/ADMINI~1/AppData/Local/Temp/kitchen/cache/cookbooks/nd-octopus/recipes/tentacle.rb:15:in `block in from_file'
|
LGTM just going to wait for #60 before merging |
|
Just do a down merge and rebase and this should be good to go |
spuder
force-pushed
the
feature/tenant
branch
2 times, most recently
from
359cbb9
to
3656caf
Compare
Default to empty array changes to ruby variable names Updates readme changes default to nil
spuder
force-pushed
the
feature/tenant
branch
from
3656caf
to
db3e109
Compare
|
Rebased. Ready 🚀 |
Closed
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.
Description
Allows cookbook to add a machine to a tenant or add tenant tags
I've manually tested this. Not sure how to automate testing this.
Contribution Check List