diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-30 14:14:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 14:14:18 -0700 |
| commit | 62cb2a8d573928cb54a7d0ba475d61a6b65e0307 (patch) | |
| tree | 74dc3c17224fe6d2b3bd4dfffc521e348c74eeb8 /roles/openshift_node_facts | |
| parent | 99c3117df11f1d6b5240dc72f57b2f7f541a234a (diff) | |
| parent | b649749bac0a086199820f91f85fe42ba99f206e (diff) | |
| download | openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.gz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.bz2 openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.xz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.zip | |
Merge pull request #5449 from abutcher/wildcard-router-cert-redeploy
Automatic merge from submit-queue.
Bug 1490186: Router pod not running after router certificates redeployment
This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over.
https://bugzilla.redhat.com/show_bug.cgi?id=1490186
Diffstat (limited to 'roles/openshift_node_facts')
| -rw-r--r-- | roles/openshift_node_facts/tasks/main.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/roles/openshift_node_facts/tasks/main.yml b/roles/openshift_node_facts/tasks/main.yml index fd4c49504..0d5fa664c 100644 --- a/roles/openshift_node_facts/tasks/main.yml +++ b/roles/openshift_node_facts/tasks/main.yml @@ -1,10 +1,4 @@ --- -- set_fact: - openshift_node_debug_level: "{{ lookup('oo_option', 'openshift_node_debug_level') }}" - when: - - openshift_node_debug_level is not defined - - lookup('oo_option', 'openshift_node_debug_level') != "" - - name: Set node facts openshift_facts: role: "{{ item.role }}" @@ -20,7 +14,7 @@ debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}" iptables_sync_period: "{{ openshift_node_iptables_sync_period | default(None) }}" kubelet_args: "{{ openshift_node_kubelet_args | default(None) }}" - labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default(none), true) }}" + labels: "{{ openshift_node_labels | default(None) }}" registry_url: "{{ oreg_url_node | default(oreg_url) | default(None) }}" schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}" sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}" |