search

openshift / openshift-sdn

Apache License 2.0
69 stars 63 forks source link

Merge flatsdn and multitenant code #208

Closed danwinship closed 8 years ago

danwinship commented 8 years ago

The flatsdn/"kube"/"subnet" and multitenant code have always been nearly identical so let's finally merge all the duplicate code (while still retaining the two plugin names with their different behavior).

(Not yet tested... want to make sure that this makes sense first)

@dcbw, @pravisankar

danwinship commented 8 years ago

(tested now)

pravisankar commented 8 years ago

minor nitpicks, otherwise LGTM We also need to update node install/vagrant provision/rpm spec scripts in the origin repo and sdn.adoc in openshift-docs repo.

danwinship commented 8 years ago

We also need to update node install/vagrant provision/rpm spec scripts in the origin repo and sdn.adoc in openshift-docs repo.

It looks like sdn.adoc is non-specific enough that it doesn't need any updates.

danwinship commented 8 years ago

@openshift/networking I think this is ready to go in?

dcbw commented 8 years ago

In the middle of testing it actually, but it all looks OK to me so far.

dcbw commented 8 years ago

ok, so we have a problem with the setup script where, if /run/openshift-sdn/docker-network is correct but lbr0 doesn't exist, the node service will error out. We'll need to update that, but I think we should merge this first and then update that after.

In any case, after I sorted out the setup issue, light testing to make sure things got set up correctly with each plugin went OK.