From 10e6673fa361f0f0e2c75628ea478edc2208b29e Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Mon, 30 Jan 2017 10:34:42 -0500 Subject: [PATCH] Symlink development service files to the source Create symbolic links so that the dev environment upstart and systemd unit files both point to the development ones. closes #2524 https://pulp.plan.io/issues/2524 --- pulp-dev.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pulp-dev.py b/pulp-dev.py index 6b684603ac..2ec342e1fb 100755 --- a/pulp-dev.py +++ b/pulp-dev.py @@ -259,18 +259,6 @@ def get_paths_to_copy(): paths.append({'source': 'server/etc/default/systemd_pulp_resource_manager', 'destination': '/etc/default/pulp_resource_manager', 'owner': 'root', 'group': 'root', 'mode': '644', 'overwrite': False}) - paths.append({'source': 'server/usr/lib/systemd/system/pulp_celerybeat.service', - 'destination': '/etc/systemd/system/pulp_celerybeat.service', 'owner': 'root', - 'group': 'root', 'mode': '644', 'overwrite': True}) - paths.append({'source': 'server/usr/lib/systemd/system/pulp_resource_manager.service', - 'destination': '/etc/systemd/system/pulp_resource_manager.service', - 'owner': 'root', 'group': 'root', 'mode': '644', 'overwrite': True}) - paths.append({'source': 'server/usr/lib/systemd/system/pulp_workers.service', - 'destination': '/etc/systemd/system/pulp_workers.service', 'owner': 'root', - 'group': 'root', 'mode': '644', 'overwrite': True}) - paths.append({'source': 'streamer/usr/lib/systemd/system/pulp_streamer.service', - 'destination': '/etc/systemd/system/pulp_streamer.service', 'owner': 'root', - 'group': 'root', 'mode': '644', 'overwrite': True}) paths.append({'source': 'server/usr/lib/tmpfiles.d/pulp.conf', 'destination': '/etc/tmpfiles.d/pulp.conf', 'owner': 'root', 'group': 'root', 'mode': '644', 'overwrite': True}) @@ -341,6 +329,15 @@ def getlinks(): '/etc/rc.d/init.d/pulp_workers')) links.append(('server/etc/rc.d/init.d/pulp_resource_manager', '/etc/rc.d/init.d/pulp_resource_manager')) + elif LSB_VERSION >= 7.0: + links.append(('server/usr/lib/systemd/system/pulp_celerybeat.service', + '/etc/systemd/system/pulp_celerybeat.service')) + links.append(('server/usr/lib/systemd/system/pulp_resource_manager.service', + '/etc/systemd/system/pulp_resource_manager.service')) + links.append(('server/usr/lib/systemd/system/pulp_workers.service', + '/etc/systemd/system/pulp_workers.service')) + links.append(('streamer/usr/lib/systemd/system/pulp_streamer.service', + '/etc/systemd/system/pulp_streamer.service')) return links