Update playbooks for Calico in OpenShift 3.10

[mgleung]

Adds back in the node selector that prevents calico from starting on nodes and fixes the outdated use of openshift.master.sdn_cluster_network_cidr.

Since it does not seem that the calico role (the important part is the check for the legacy systemd service) gets run during an upgrade from OpenShift 3.9 to 3.10, we will still need to keep that role and the node selector (as per #9435 (comment)).

Calico will also require the changes made in #9621 to function properly.

[papr-bot]

Can one of the admins verify this patch?
I understand the following commands:

• bot, add author to whitelist
• bot, test pull request
• bot, test pull request once

[mgleung]

@sdodson @vrutkovs Can I bother one of you to take a look at this? These fixes are required in order to get Calico working in OpenShift 3.10.

[vrutkovs]

I'd prefer to have master fixed first (I think this one is almost ready, right?) and have commits cherrypicked to 3.10 instead. This would help us ensure this won't break in 3.11 and trace changes back to 3.10.

[mgleung]

@vrutkovs I was planning on using #9435 as the master changes since there is no possibility of having users upgrading from a Calico systemd service when upgrading from OpenShift 3.10 to OpenShift 3.11. This makes it so we can remove the changes that need to be applied per node in order to properly handle upgrading, and lets us clean up some of our roles.

Since there is a possibility that we will have users upgrading from using Calico as a systemd service from OpenShift 3.9 to 3.10, we will need to keep the old structure for the 3.10 branch. This PR unfortunately has to be different from the one going into master to cover that possibility.

[vrutkovs]

Okay, makes sense
/ok-to-test

[vrutkovs]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgleung, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [vrutkovs]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment