Bug 1588371

Description of problem:
The feature comes from https://bugzilla.redhat.com/show_bug.cgi?id=1359848

Now it doesn't work in openshift-ansible-3.10.0-0.63.0.git.0.961c60d.el7.noarch.rpm

Version-Release number of the following components:
openshift-ansible-3.10.0-0.63.0.git.0.961c60d.el7.noarch.rpm

How reproducible:
always

Steps to Reproduce:
1. Trigger 3.9 installation 
2. Delete one node by "oc delete"
#oc delete node qe-ghuang-reg-node-registry-router-1
3. restart the node to register

Actual results:
Before node deletion:
# oc get nodes --show-labels=true
<--snip-->
qe-ghuang-reg-node-registry-router-1   Ready     compute   9m        v1.10.0+b81c8f8   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=n1-standard-1,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-central1,failure-domain.beta.kubernetes.io/zone=us-central1-a,kubernetes.io/hostname=qe-ghuang-reg-node-registry-router-1,node-role.kubernetes.io/compute=true,registry=enabled,role=node,router=enabled


After the node register. It's missing "registry=enabled,role=node,router=enabled" which is defined in anible inventory file.
[root@qe-ghuang-reg-master-etcd-1 ~]# oc get nodes --show-labels=true 
<--snip-->
qe-ghuang-reg-node-registry-router-1   Ready     compute   30s       v1.10.0+b81c8f8   beta.kubernetes.io/arch=amd64,beta.kubernetes.io/instance-type=n1-standard-1,beta.kubernetes.io/os=linux,failure-domain.beta.kubernetes.io/region=us-central1,failure-domain.beta.kubernetes.io/zone=us-central1-a,kubernetes.io/hostname=qe-ghuang-reg-node-registry-router-1,node-role.kubernetes.io/compute=true


Expected results:

Additional info:
# grep -A 2 "node-labels:" /etc/origin/node/node-config.yaml
  node-labels:
  - node-role.kubernetes.io/compute=true
  pod-manifest-path: