aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenjiro Nakayama <nakayamakenjiro@gmail.com>2018-05-24 17:32:18 +0900
committerBryn M. Reeves <bmr@redhat.com>2018-06-18 15:26:18 +0100
commit1becd754a8cae83cd993662a467f19aeedcc4750 (patch)
treec75f1adf0bbf61cca2fc6b2a8b3989f08d5fad29
parent0c8adca8ec03ff048109c8ed375663abaf8bc593 (diff)
downloadsos-1becd754a8cae83cd993662a467f19aeedcc4750.tar.gz
[origin] Collect {resolv,node-dnsmasq}.conf under /etc/origin/node
Since OCP 3.6+, there are some DNS config under /etc/origin/node/ such as `node-dnsmasq.conf` and `resolv.conf`. Although current sosreport does not gather them, these are important for troubleshooting of DNS issues. This patch updates origin.py to collect {resolv,node-dnsmasq}.conf under /etc/origin/node/. Resolves: #1311 Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/origin.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sos/plugins/origin.py b/sos/plugins/origin.py
index 6b03a76a..02bc047a 100644
--- a/sos/plugins/origin.py
+++ b/sos/plugins/origin.py
@@ -159,6 +159,8 @@ class OpenShiftOrigin(Plugin):
bstrap_node_cfg,
bstrap_kubeconfig,
os.path.join(self.node_base_dir, "*.crt"),
+ os.path.join(self.node_base_dir, "resolv.conf"),
+ os.path.join(self.node_base_dir, "node-dnsmasq.conf"),
])
self.add_journal(units="atomic-openshift-node")