diff options
| author | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-09-03 09:24:28 -0700 |
|---|---|---|
| committer | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-09-03 09:24:28 -0700 |
| commit | e45af8287f8118830c2328c9630f6ee4d5776ce8 (patch) | |
| tree | 4566df220395faa715698437b81dfe6efffa816e /playbooks | |
| parent | 7d480fbab74ddc8f76279f32c1a64148e5844382 (diff) | |
| parent | 8e3d2689c442762cdd5df08ca31721c5b17b2ee8 (diff) | |
| download | openshift-e45af8287f8118830c2328c9630f6ee4d5776ce8.tar.gz openshift-e45af8287f8118830c2328c9630f6ee4d5776ce8.tar.bz2 openshift-e45af8287f8118830c2328c9630f6ee4d5776ce8.tar.xz openshift-e45af8287f8118830c2328c9630f6ee4d5776ce8.zip | |
Merge pull request #522 from dak1n1/master_schedule
added new fact for schedulability and fixed spelling
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index ba2f40d55..a14ca8e11 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -20,6 +20,7 @@ local_facts: labels: "{{ openshift_node_labels | default(None) }}" annotations: "{{ openshift_node_annotations | default(None) }}" + schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}" - name: Check status of node certificates stat: path: "{{ openshift.common.config_base }}/node/{{ item }}" @@ -124,21 +125,14 @@ - os_env_extras - os_env_extras_node -- name: Set scheduleability +- name: Set schedulability hosts: oo_first_master vars: openshift_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) | oo_collect('openshift.common.hostname') }}" - openshift_unscheduleable_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([])) - | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}" openshift_node_vars: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']) }}" pre_tasks: - - set_fact: - openshift_scheduleable_nodes: "{{ hostvars - | oo_select_keys(groups['oo_nodes_to_config'] | default([])) - | oo_collect('openshift.common.hostname') - | difference(openshift_unscheduleable_nodes) }}" roles: - openshift_manage_node |