diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-02 04:59:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 04:59:16 -0800 |
| commit | 22462aa17098116660d4600c9a1e87cd3ad40698 (patch) | |
| tree | a1f848e11070e1fee1f638b34f952e6060d670c4 /roles | |
| parent | 55b91ccaa38d759829327589fbaa27ad12d7fd26 (diff) | |
| parent | 6093e718a91879c140fa6a6967a345456f583144 (diff) | |
| download | openshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.gz openshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.bz2 openshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.xz openshift-22462aa17098116660d4600c9a1e87cd3ad40698.zip | |
Merge pull request #6949 from vrutkovs/schedulable-masters
Automatic merge from submit-queue.
Make masters schedulable by default
Fixes #6930
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_manage_node/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_manage_node/tasks/config.yml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/roles/openshift_manage_node/defaults/main.yml b/roles/openshift_manage_node/defaults/main.yml index 00e04b9f2..b7a89a723 100644 --- a/roles/openshift_manage_node/defaults/main.yml +++ b/roles/openshift_manage_node/defaults/main.yml @@ -1,9 +1,5 @@ --- # openshift_manage_node_is_master is set at the play level. openshift_manage_node_is_master: False - -# Default is to be schedulable except for master nodes. -l_openshift_manage_schedulable: "{{ openshift_schedulable | default(not openshift_manage_node_is_master) }}" - openshift_master_node_labels: node-role.kubernetes.io/master: 'true' diff --git a/roles/openshift_manage_node/tasks/config.yml b/roles/openshift_manage_node/tasks/config.yml index 4f00351b5..e5753d185 100644 --- a/roles/openshift_manage_node/tasks/config.yml +++ b/roles/openshift_manage_node/tasks/config.yml @@ -2,7 +2,7 @@ - name: Set node schedulability oc_adm_manage_node: node: "{{ openshift.node.nodename | lower }}" - schedulable: "{{ 'true' if l_openshift_manage_schedulable | bool else 'false' }}" + schedulable: "{{ 'true' if openshift_schedulable | default(true) | bool else 'false' }}" retries: 10 delay: 5 register: node_schedulable @@ -23,5 +23,5 @@ delegate_to: "{{ openshift_master_host }}" vars: l_node_labels: "{{ openshift_node_labels | default({}) }}" - l_master_labels: "{{ ('oo_masters_to_config' in group_names) | ternary(openshift_master_node_labels, {}) }}" + l_master_labels: "{{ openshift_manage_node_is_master | ternary(openshift_master_node_labels, {}) }}" l_all_labels: "{{ l_node_labels | combine(l_master_labels) }}" |