Merge pull request #7828 from ozdanborne/master

Calico fixes

roles/calico_master/tasks/certs.yml

@@ -39,6 +39,7 @@
 - name: Create secret
   oc_secret:
     name: calico-etcd-secrets
+    state: present
     namespace: kube-system
     files:
     - name: etcd-key

roles/calico_master/tasks/main.yml

@@ -15,6 +15,12 @@
     resource_name: privileged
     state: present
 
+- name: Set default selector for kube-system
+  command: >
+    {{ openshift_client_binary }}
+    --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+    annotate  ns kube-system openshift.io/node-selector="" --overwrite
+
 - name: Calico Master | Create temp directory
   command: mktemp -d /tmp/openshift-ansible-XXXXXXX
   register: mktemp