Browse Source

Remove openshift_manage_node_is_master

Vadim Rutkovsky 6 years ago
parent
commit
163dbf262f

+ 0 - 1
playbooks/openshift-master/private/config.yml

@@ -138,7 +138,6 @@
   roles:
   - role: openshift_manage_node
     openshift_master_host: "{{ groups.oo_first_master.0 }}"
-    openshift_manage_node_is_master: "{{ ('oo_masters_to_config' in group_names) | bool }}"
     openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
 
 - name: Master Install Checkpoint End

+ 0 - 1
playbooks/openshift-master/private/upgrade.yml

@@ -255,4 +255,3 @@
       tasks_from: config.yml
     vars:
       openshift_master_host: "{{ groups.oo_first_master.0 }}"
-      openshift_manage_node_is_master: true

+ 0 - 1
playbooks/openshift-node/private/join.yml

@@ -63,7 +63,6 @@
   roles:
   - role: openshift_manage_node
     openshift_master_host: "{{ groups.oo_first_master.0 }}"
-    openshift_manage_node_is_master: "{{ ('oo_masters_to_config' in group_names) | bool }}"
 
 - name: Node Join Checkpoint End
   hosts: all

+ 0 - 2
roles/openshift_manage_node/defaults/main.yml

@@ -1,5 +1,3 @@
 ---
-# openshift_manage_node_is_master is set at the play level.
-openshift_manage_node_is_master: False
 openshift_master_node_labels:
   node-role.kubernetes.io/master: 'true'