GCP upgrade: don't exclude nodes with tag_ocp-bootstrap

roles/openshift_gcp/tasks/setup_scale_group_facts.yml

@@ -1,10 +1,14 @@
 ---
+- name: Set var to exclude bootstrapped nodes
+  set_fact:
+    bootstrapped_nodes: "{{ all_nodes | default(false) | ternary([], groups['tag_ocp-bootstrap']) | default([]) }}"
+
 - name: Add node instances to node group
   add_host:
     name: "{{ hostvars[item].gce_name }}"
     groups: nodes, new_nodes
     openshift_node_group_name: "{{ openshift_gcp_node_group_mapping['compute'] }}"
-  with_items: "{{ groups['tag_ocp-node'] | default([]) }}"
+  with_items: "{{ groups['tag_ocp-node'] | default([]) | difference(bootstrapped_nodes) }}"
 
 - name: Add bootstrap node instances as nodes
   add_host:
@@ -17,14 +21,14 @@
   add_host:
     name: "{{ hostvars[item].gce_name }}"
     groups: nodes
-  with_items: "{{ groups['tag_ocp-master'] | default([]) | difference(groups['tag_ocp-bootstrap'] | default([])) }}"
+  with_items: "{{ groups['tag_ocp-master'] | default([]) | difference(bootstrapped_nodes) }}"
 
 - name: Add infra node instances to node group
   add_host:
     name: "{{ hostvars[item].gce_name }}"
     groups: nodes, new_nodes
     openshift_node_group_name: "{{ openshift_gcp_node_group_mapping['infra'] }}"
-  with_items: "{{ groups['tag_ocp-infra-node'] | default([]) }}"
+  with_items: "{{ groups['tag_ocp-infra-node'] | default([]) | difference(bootstrapped_nodes) }}"
 
 - name: Add masters to requisite groups
   add_host: