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

Allow users to set accepted_resource_roles in marathon yamls. #164

Merged
merged 2 commits into from
Jan 19, 2016

Conversation

EvanKrall
Copy link
Member

internal ticket PAASTA-2455.

This passes the accepted_resource_roles parameter through marathon.yaml into the marathon config, allowing for apps to be deployed to dedicated hardware.

@nhandler
Copy link
Contributor

You will also need to update paasta_tools/cli/schemas/marathon_schema.json

@solarkennedy
Copy link
Contributor

Can you update the docs as well?

This is going to cause a big bounce too right? :(

@EvanKrall
Copy link
Member Author

@solarkennedy Yeah, this would cause a large bounce.

We could avoid that by using the --default_accepted_resource_roles command line parameter for Marathon, and omit accepted_resource_roles from the formatted marathon dict if it's not specified.

Should I try to do that?

@EvanKrall
Copy link
Member Author

I've made it so that the config dict doesn't contain accepted_resource_roles if it's not specified in your marathon.yaml

Conflicts:
	paasta_tools/marathon_tools.py
	tests/test_marathon_tools.py
EvanKrall added a commit that referenced this pull request Jan 19, 2016
Allow users to set accepted_resource_roles in marathon yamls.
@EvanKrall EvanKrall merged commit a6b815c into master Jan 19, 2016
@asottile asottile deleted the roles branch May 31, 2016 21:46
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