From 61ad7651134f306eea8d71f4b14eec86f9d1b5b4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 6 Feb 2017 23:59:56 +0000 Subject: [PATCH] some container service file changes --- roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service | 3 ++- roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service | 3 ++- roles/mirrormanager/mirrorlist_proxy/tasks/main.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service index 0d81651905..3a07c8ee85 100644 --- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service +++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service @@ -5,7 +5,8 @@ Requires=docker.service [Service] TimeoutStartSec=0 -ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -p 18081:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219 +ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18081:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219 +ExecStop=/usr/bin/docker stop %n [Install] WantedBy=multi-user.target diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service index 11f34d2a06..ae43039e60 100644 --- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service +++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service @@ -5,7 +5,8 @@ Requires=docker.service [Service] TimeoutStartSec=0 -ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -p 18082:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219 +ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18082:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219 +ExecStop=/usr/bin/docker stop %n [Install] WantedBy=multi-user.target diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml index ebe88cbd1c..f0be005b55 100644 --- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml +++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml @@ -29,6 +29,8 @@ - mirrorlist2 tags: - mirrorlist_proxy + notify: + reload systemd # We enable mirrorlist1 so we have one that always starts on boot. The pkl deployment script # will make sure that at least one is running and the other is killed.