Add support for multiple platforms in OpenShift. #4944

Merged
merged 2 commits into from Mar 13, 2014

Conversation

Projects
None yet
4 participants
Contributor

viovanov commented Mar 12, 2014

Changes span both the broker and the node.

Add a setting named 'NODE_PLATFORMS' to broker.conf.
Add an optional attribute named 'platform' to cartridge manifests.
Add an optional 'Required' attribute for the 'Scaling' key to cartridge manifest.

Broker queries nodes of all platforms when building its cartridge cache.
Broker does not allow group overrides for cartridges of different platforms.
Broker uses the cartridge platform to filter nodes based on the 'kernel' fact.

Node handles the case when a web proxy cartridge is not collocated with a web cartridge.

Modify tests to take new logic into account.
Add tests to cover new code paths.

@viovanov viovanov Add support for multiple platforms in OpenShift.
Changes span both the broker and the node.

Add a setting named 'NODE_PLATFORMS' to broker.conf.
Add an optional attribute named 'platform' to cartridge manifests.
Add an optional 'Required' attribute for the 'Scaling' key to cartridge manifest.

Broker queries nodes of all platforms when building its cartridge cache.
Broker does not allow group overrides for cartridges of different platforms.
Broker uses the cartridge platform to filter nodes based on the 'kernel' fact.

Node handles the case when a web proxy cartridge is not collocated with a web cartridge.

Modify tests to take new logic into account.
Add tests to cover new code paths.
aab674f
Member

abhgupta commented Mar 12, 2014

Configuration changes --> openshift/li#2471

Owner

danmcp commented Mar 12, 2014

[test]

@viovanov viovanov Fix "create scalable app with custom web_proxy" test expectation.
Fix getting cart from CartridgeCache in the context of an application.
bd24376
Owner

danmcp commented Mar 12, 2014

[test] again with [extended:broker,node,gear,rhc,cartridge]

Owner

danmcp commented Mar 13, 2014

[merge]

Member

openshift-bot commented Mar 13, 2014

Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test_pull_requests/6796/) (Image: devenv_4504)

Member

openshift-bot commented Mar 13, 2014

Evaluated for online up to bd24376

@openshift-bot openshift-bot added a commit that referenced this pull request Mar 13, 2014

@openshift-bot openshift-bot Merge pull request #4944 from UhuruSoftware/master
Merged by openshift-bot
df9fce5

@openshift-bot openshift-bot merged commit df9fce5 into openshift:master Mar 13, 2014

1 check was pending

default Testing
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment