diff options
| author | Carlos Goncalves <cgoncalves@redhat.com> | 2020-08-03 22:17:22 +0200 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2020-08-04 12:09:14 -0400 |
| commit | 350b28f592280b420791363d8c515b67cf48cfcc (patch) | |
| tree | 1ef29465a1b36ef56df118f04d785c1c2477aa5c | |
| parent | 414add4a2d9d2f91622f2d0da94a26f30ba7508c (diff) | |
| download | sos-350b28f592280b420791363d8c515b67cf48cfcc.tar.gz | |
[openstack_octavia] Copy all etc files
Deployments may have multiple .conf and other relevant files (e.g.
policy.json) files under var_config_data and var_puppet_gen etc/octavia
directories. This is true for OpenStack TripleO deployments.
Closes: #2181
Resolves: #2182
Signed-off-by: Carlos Goncalves <cgoncalves@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/report/plugins/openstack_octavia.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sos/report/plugins/openstack_octavia.py b/sos/report/plugins/openstack_octavia.py index 1c376d80..62cbbc14 100644 --- a/sos/report/plugins/openstack_octavia.py +++ b/sos/report/plugins/openstack_octavia.py @@ -16,7 +16,8 @@ class OpenStackOctavia(Plugin): plugin_name = "openstack_octavia" profiles = ('openstack', 'openstack_controller') - var_puppet_gen = "/var/lib/config-data/puppet-generated/octavia" + var_config_data = "/var/lib/config-data" + var_puppet_gen = var_config_data + "/puppet-generated/octavia" def setup(self): # configs @@ -25,13 +26,15 @@ class OpenStackOctavia(Plugin): "/etc/logrotate.d/openstack-octavia", "/etc/octavia/*", "/var/lib/octavia", - self.var_puppet_gen + "/etc/octavia/conf.d", - self.var_puppet_gen + "/etc/octavia/octavia.conf", + self.var_config_data + "/octavia/etc/octavia", + self.var_puppet_gen + "/etc/octavia", self.var_puppet_gen + "/etc/my.cnf.d/tripleo.cnf", ]) # don't collect certificates self.add_forbidden_path("/etc/octavia/certs") + self.add_forbidden_path(self.var_config_data + "/etc/octavia/certs") + self.add_forbidden_path(self.var_puppet_gen + "/etc/octavia/certs") # logs if self.get_option("all_logs"): |