diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-01 06:54:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 06:54:59 -0400 |
| commit | bf0bf407479458206f48885e43d3e1d3a2eab6e1 (patch) | |
| tree | ae7565c4ab46239049bbd012d1df3bac4198211d /playbooks | |
| parent | ca398e546b5b19b84b349e56c4a5b8d85ad7056b (diff) | |
| parent | 6bf9371c6cb52b2727dd52bc38f2b8b3a01d67d8 (diff) | |
| download | openshift-bf0bf407479458206f48885e43d3e1d3a2eab6e1.tar.gz openshift-bf0bf407479458206f48885e43d3e1d3a2eab6e1.tar.bz2 openshift-bf0bf407479458206f48885e43d3e1d3a2eab6e1.tar.xz openshift-bf0bf407479458206f48885e43d3e1d3a2eab6e1.zip | |
Merge pull request #4912 from abutcher/openshift-node-facts
Merged by openshift-bot
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 501ba4273..ef7d54f9f 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -1,25 +1,4 @@ --- -- name: Gather and set facts for node hosts - hosts: oo_nodes_to_config - vars: - t_oo_option_node_debug_level: "{{ lookup('oo_option', 'openshift_node_debug_level') }}" - pre_tasks: - - set_fact: - openshift_node_debug_level: "{{ t_oo_option_node_debug_level }}" - when: openshift_node_debug_level is not defined and t_oo_option_node_debug_level != "" - roles: - - openshift_facts - tasks: - # Since the master is generating the node certificates before they are - # configured, we need to make sure to set the node properties beforehand if - # we do not want the defaults - - openshift_facts: - role: node - local_facts: - labels: "{{ openshift_node_labels | default(None) }}" - annotations: "{{ openshift_node_annotations | default(None) }}" - schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}" - - name: Evaluate node groups hosts: localhost become: no @@ -32,7 +11,11 @@ ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" ansible_become: "{{ g_sudo | default(omit) }}" with_items: "{{ groups.oo_nodes_to_config | default([]) }}" - when: hostvars[item].openshift is defined and hostvars[item].openshift.common is defined and hostvars[item].openshift.common.is_containerized | bool and (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config) + when: + - hostvars[item].openshift is defined + - hostvars[item].openshift.common is defined + - hostvars[item].openshift.common.is_containerized | bool + - (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config) changed_when: False - name: Configure containerized nodes |