summaryrefslogtreecommitdiffstats
path: root/roles/cockpit-ui/tasks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-23 04:24:43 -0700
committerGitHub <noreply@github.com>2017-09-23 04:24:43 -0700
commit447ec08f82ff32cd9bf7b85dcfaef5313fc1f291 (patch)
tree9765c3395c239cf26e726c58b4b3682973fd331b /roles/cockpit-ui/tasks
parente1650a2e1da3b1a365a8e4f021d1c55fe4ffc72d (diff)
parent3ebc0b591f9445b8fde65bda3f76666bad2c8ca3 (diff)
downloadopenshift-447ec08f82ff32cd9bf7b85dcfaef5313fc1f291.tar.gz
openshift-447ec08f82ff32cd9bf7b85dcfaef5313fc1f291.tar.bz2
openshift-447ec08f82ff32cd9bf7b85dcfaef5313fc1f291.tar.xz
openshift-447ec08f82ff32cd9bf7b85dcfaef5313fc1f291.zip
Merge pull request #5384 from joelddiaz/node-fact-filter
Automatic merge from submit-queue move (and rename) get_dns_ip filter into openshift_node_facts Due to recent changes to filter_plugins/openshift_node.py, when trying to run a current version of the openshift_node_facts role on a system with an older version of the openshift-ansible-filter-plugins RPM, the new role will fail. ``` File "/usr/share/ansible_plugins/filter_plugins/openshift_node.py", line 30, in get_dns_ip if bool(hostvars['openshift']['common']['use_dnsmasq']): KeyError: 'use_dnsmasq' ``` It's not possible for us to have our current RPM version (presently openshift-ansible-filter-plugins-3.5.120-1.git.0.c60f69a.el7.noarch) and a newer RPM installed and run both current openshift-ansible code and older checked-out/vendored releases (for older clusters/releases). Since only the openshift_node_facts role uses the get_dns_ip filter, move the functionality into a role-specific filter plugin. In addition, rename the filter plugin to 'node_get_dns_ip' because Ansible is preffering the get_dns_ip from the RPM (ie /usr/share/ansible_plugins/filter_plugins/openshift_node.py) over the role-specific filter plugin of the same name. Ansile prefers the filter plugins in /usr/share/ansible_plugins/filter_plugins/* even when /etc/ansible/ansible.cfg is set to something like: filter_plugins = filter_plugins:/usr/share/ansible_plugins/filter_plugins:filter_plugins <--- yes, 'filter_plugins' before and after /usr/share/ansible_plugins/filter_plugins (ansible 2.3.1.0) (perhaps this is because the /usr/share/ansible/plugins/filter symlink to /usr/share/ansible_plugins/filter_plugins takes precedence over everything???) Renaming the filter plugin function ensures that versions of the openshift_node_facts role that depend on the old implementation can continue to use it through what the older RPM provides, and the new role can use it's role-specific filter plugin without any variable namespace collisions. Lastly, remove filter_plugins/openshift_node.py since it is now self-contained in roles/openshift_node_facts. https://bugzilla.redhat.com/show_bug.cgi?id=1494312
Diffstat (limited to 'roles/cockpit-ui/tasks')
0 files changed, 0 insertions, 0 deletions