Remove openshift_is_bootstrapped variable

All nodes are now bootstrapped, therefore this conditional logic is no
longer necessary.

playbooks/gcp/openshift-cluster/install.yml

@@ -25,7 +25,8 @@
 - name: install components
   import_playbook: ../../common/private/components.yml
 
-- hosts: primary_master
+- name: Copy the kubeconfig, used by CI to determine when the containers are ready
+  hosts: oo_first_master
   gather_facts: no
   tasks:
   - name: Retrieve cluster configuration

playbooks/init/basic_facts.yml

@@ -32,17 +32,6 @@
     - openshift_deployment_type is undefined
     - deployment_type is defined
 
-  - name: check for node already bootstrapped
-    stat:
-      path: "/etc/origin/node/bootstrap-node-config.yaml"
-      get_checksum: false
-      get_attributes: false
-      get_mime: false
-    register: bootstrap_node_config_path_check
-  - name: initialize_facts set fact openshift_is_bootstrapped
-    set_fact:
-      openshift_is_bootstrapped: "{{ openshift_is_bootstrapped|default(False) or bootstrap_node_config_path_check.stat.exists }}"
-
   - name: initialize_facts set fact openshift_is_atomic and openshift_is_containerized
     set_fact:
       openshift_is_atomic: "{{ ostree_booted.stat.exists }}"

playbooks/init/cluster_facts.yml

@@ -61,7 +61,6 @@
       role: node
       local_facts:
         sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
-        bootstrapped: "{{ openshift_is_bootstrapped }}"
 
 - name: Initialize etcd host variables
   hosts: oo_masters_to_config

playbooks/openshift-node/private/bootstrap.yml

@@ -13,10 +13,6 @@
           status: "In Progress"
           start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- name: Only target nodes that have not yet been bootstrapped
-  hosts: localhost
-  tasks:
-
 - import_playbook: disable_excluders.yml
 
 - import_playbook: configure_nodes.yml

playbooks/openshift-node/private/configure_bootstrap.yml

@@ -12,5 +12,3 @@
     import_role:
       name: openshift_node_group
       tasks_from: bootstrap_config.yml
-  - set_fact:
-      openshift_is_bootstrapped: True

roles/etcd/defaults/main.yaml

@@ -2,8 +2,6 @@
 r_etcd_common_backup_tag: ''
 r_etcd_common_backup_sufix_name: ''
 
-l_etcd_bootstrapped: '{{ openshift.node.bootstrapped }}'
-
 l_etcd_static_pod: "{{ (inventory_hostname in groups['oo_masters']) | bool }}"
 
 # runc, docker, static pod, host

roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml

@@ -5,7 +5,6 @@
     state: present
   when:
   - not etcd_is_atomic | bool
-  - not openshift_is_bootstrapped | bool
   register: result
   until: result is succeeded
 

roles/openshift_facts/library/openshift_facts.py

@@ -485,10 +485,7 @@ def set_nodename(facts):
         # elif 'cloudprovider' in facts and facts['cloudprovider']['kind'] == 'openstack':
         #     facts['node']['nodename'] = facts['provider']['metadata']['hostname'].replace('.novalocal', '')
         else:
-            if 'bootstrapped' in facts['node'] and facts['node']['bootstrapped']:
-                facts['node']['nodename'] = facts['common']['raw_hostname'].lower()
-            else:
-                facts['node']['nodename'] = facts['common']['hostname'].lower()
+            facts['node']['nodename'] = facts['common']['raw_hostname'].lower()
     return facts
 
 

roles/openshift_gcp/tasks/setup_scale_group_facts.yml

@@ -6,28 +6,13 @@
     openshift_node_group_name: "{{ openshift_gcp_node_group_mapping['compute'] }}"
   with_items: "{{ groups['tag_ocp-node'] | default([]) | difference(groups['tag_ocp-bootstrap'] | default([])) }}"
 
-- name: Add bootstrap node instances
-  add_host:
-    name: "{{ hostvars[item].gce_name }}"
-    groups: bootstrap_nodes
-    openshift_is_bootstrapped: True
-    openshift_node_group_name: "{{ openshift_gcp_node_group_mapping['compute'] }}"
-  with_items: "{{ groups['tag_ocp-node'] | default([]) | intersect(groups['tag_ocp-bootstrap'] | default([])) }}"
-
 - name: Add bootstrap node instances as nodes
   add_host:
     name: "{{ item }}"
     groups: nodes, new_nodes
-    openshift_is_bootstrapped: True
   with_items: "{{ groups['tag_ocp-bootstrap'] | default([]) }}"
   when: all_nodes | default(False)
 
-- name: Add a master to the primary masters group
-  add_host:
-    name: "{{ hostvars[item].gce_name }}"
-    groups: primary_master
-  with_items: "{{ groups['tag_ocp-master'].0 }}"
-
 - name: Add non-bootstrapping master node instances to node group
   add_host:
     name: "{{ hostvars[item].gce_name }}"

roles/openshift_node/tasks/distribute_bootstrap.yml

@@ -1,9 +1,4 @@
 ---
-- name: Gather node information
-  openshift_facts:
-    role: node
-    local_facts:
-      bootstrapped: true
 
 - name: Copy master bootstrap config locally
   slurp: