Merge pull request #319 from brenton/master

fixes for node scheduleability

playbooks/common/openshift-node/config.yml

@@ -141,12 +141,12 @@
   vars:
     openshift_unscheduleable_nodes: "{{ hostvars
                                         | oo_select_keys(groups['oo_nodes_to_config']) 
-                                        | oo_collect('openshift_hostname', {'openshift_scheduleable': False}) }}"
+                                        | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}"
   pre_tasks:
   - set_fact:
       openshift_scheduleable_nodes: "{{ hostvars
                                       | oo_select_keys(groups['oo_nodes_to_config'])
-                                      | oo_collect('openshift_hostname') 
+                                      | oo_collect('openshift.common.hostname')
                                       | difference(openshift_unscheduleable_nodes) }}"
   roles:
   - openshift_manage_node

roles/openshift_manage_node/tasks/main.yml

@@ -1,11 +1,9 @@
 - name: Handle unscheduleable node
-  delegate_to: "{{ openshift_first_master }}"
   command: >
     {{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=false
   with_items: openshift_unscheduleable_nodes
 
 - name: Handle scheduleable node
-  delegate_to: "{{ openshift_first_master }}"
   command: >
     {{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=true
   with_items: openshift_scheduleable_nodes

roles/openshift_node_certificates/tasks/main.yml

@@ -21,7 +21,6 @@
   with_items: nodes_needing_certs
 
 - name: Generate the node server certificate
-  delegate_to: "{{ openshift_first_master }}"
   command: >
     {{ openshift.common.admin_binary }} create-server-cert
       --cert=server.crt --key=server.key --overwrite=true