Make sure that the arvados-docker-cleaner systemd service file is installed in

the correct directory.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index b48b46bb9a4c48b52770996fba12821c60e5cb8e..0221707cf410f7a0e417a42ccfda8afa27d5bf70 100644 (file)
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -6,7 +6,7 @@
 Description=Arvados Docker Image Cleaner
 Documentation=https://doc.arvados.org/
 After=network.target
-AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
+#AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
 
 # systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
 StartLimitInterval=0

diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 9d8505e7e66b333a2d336a68fc9eb6c3f147ce94..74053ec1aeb80d27eb756781d81715d70c25cc00 100644 (file)
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -34,7 +34,8 @@ setup(name="arvados-docker-cleaner",
           'console_scripts': ['arvados-docker-cleaner=arvados_docker.cleaner:main'],
       },
       data_files=[
-          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt', 'arvados-docker-cleaner.service']),
+          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt']),
+          ('/lib/systemd/system/', ['arvados-docker-cleaner.service']),
       ],
       install_requires=[
           'docker-py==1.7.2',