Merge lp:~ursinha/landscape-charm/add-etc-hosts-and-friends into lp:~landscape/landscape-charm/tools

[Ursula Junque]

Adding /etc/hosts and /etc/network to the list of collected logs.

Adding /etc/hosts and /etc/network to the list of collected logs.

Also added a Makefile so we can just "make test" to run unit tests.

[Alberto Donato (ack)]

+1

review: Approve

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2016-09-14 22:31:07 +0000
@@ -0,0 +1,4 @@
+test:
+	python -m unittest test_collect-logs
+
+.PHONY: test

=== modified file 'collect-logs'
--- collect-logs	2016-08-31 15:32:04 +0000
+++ collect-logs	2016-09-14 22:31:07 +0000
@@ -18,7 +18,10 @@
 log = logging.getLogger("collect-logs")
 PRG = os.path.abspath(__file__)
 LOGS = [
+    # Basics
     "/var/log",
+    "/etc/hosts",
+    "/etc/network",
     # for the landscape client
     "/var/lib/landscape/client",
     # for the landscape server charm

=== modified file 'test_collect-logs.py'
--- test_collect-logs.py	2016-08-29 18:26:55 +0000
+++ test_collect-logs.py	2016-09-14 22:31:07 +0000
@@ -325,6 +325,8 @@
                    ).format(
                        tarfile,
                        " ".join(["/var/log",
+                                 "/etc/hosts",
+                                 "/etc/network",
                                  "/var/lib/landscape/client",
                                  "/etc/apache2",
                                  "/etc/haproxy",
@@ -396,6 +398,8 @@
                    ).format(
                        tarfile,
                        " ".join(["/var/log",
+                                 "/etc/hosts",
+                                 "/etc/network",
                                  "/var/lib/landscape/client",
                                  "/etc/apache2",
                                  "/etc/haproxy",