diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-07 11:47:07 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-07 11:47:07 -0400 |
| commit | 442abb7a4cb8c5c36b38ff38f2315a6a8b380ffa (patch) | |
| tree | eaba09b00391e361887ae2417d38f35ae51c6aac | |
| parent | d24c15acde4f061f174fecc1f3312da2dea5ba19 (diff) | |
| parent | 93c2bf00cd766771455e82a3fb9fd56d1a1c8dd5 (diff) | |
| download | openshift-442abb7a4cb8c5c36b38ff38f2315a6a8b380ffa.tar.gz openshift-442abb7a4cb8c5c36b38ff38f2315a6a8b380ffa.tar.bz2 openshift-442abb7a4cb8c5c36b38ff38f2315a6a8b380ffa.tar.xz openshift-442abb7a4cb8c5c36b38ff38f2315a6a8b380ffa.zip | |
Merge pull request #319 from brenton/master
fixes for node scheduleability
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node_certificates/tasks/main.yml | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 0eec1ae61..2017a7156 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/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 diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index d4c623f10..b9ab16e7c 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/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 diff --git a/roles/openshift_node_certificates/tasks/main.yml b/roles/openshift_node_certificates/tasks/main.yml index 1b68bc673..949afc5eb 100644 --- a/roles/openshift_node_certificates/tasks/main.yml +++ b/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 |