re-enable portworx

[deads2k]

The rebase had to disable portworx because of a double proto registration. See UPSTREAM: <drop>: hack out portworx to avoid double proto registration in the rebase branch here #15234.

That pull is reviewed and green, so its a good base for starting over. If you revert the UPSTREAM patch, you'll see error messages about duplicate registrations.

[harsh-px]

@deads2k Can we please get this back?

As a result of this, people using Openshift 3.6 are not able to use Portworx.

[deads2k]

As a result of this, people using Openshift 3.6 are not able to use Portworx.

This is known in 3.7 (happened during the rebase). If it's broken in 3.6, then that's a separate and unknown problem.

@derekwaynecarr @rootfs

[rootfs]

@deads2k portworx volume should work, but provisioner is not enabled (missing in here)

@harsh-px refer to #15661

[harsh-px]

@rootfs Thanks for the info. If we submit a PR now to enable the provisioner, can this make it to any 3.6 patch release?

[adityadani]

PR #15862 got merged.
What is the procedure to cherry-pick changes into release-3.6 branch? We would like to enable portworx for the upcoming 3.6.x release.

[adityadani]

@deads2k What is the procedure to cherry-pick changes from master to a release branch?

[liggitt]

it was disabled only in the 3.7 branch as part of the rebase onto 1.7

[adityadani]

@liggitt. This PR #15862 solves two issues

1. solves the protobuf conflict because of which portworx was disabled (code commented out) in rebase 1.7 branch
2. Enables the portworx plugin in openshift. (adds portworx to the list of plugins in openshift)
   AFAIK we will need to enable portworx just like other plugins Enable Scaleio volume #15661.
   But we wanted to do it the one of the 3.6.x releases as well. Is it possible to do so?