diff --git a/templates/etc/systemd/system/nodepool-builder.service b/templates/etc/systemd/system/nodepool-builder.service index 1623c43..8fbf6ed 100644 --- a/templates/etc/systemd/system/nodepool-builder.service +++ b/templates/etc/systemd/system/nodepool-builder.service @@ -6,12 +6,9 @@ After=syslog.target network.target Type=simple # Options to pass to nodepool-builder. Environment="ARGS=-l /etc/nodepool/builder-logging.conf" -# The prefix used when nodepool-builder was installed. Be sure to update this -# value if you are using a virtualenv. -Environment="PREFIX=/usr/local" Group=nodepool User=nodepool -ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-builder -d ${ARGS}" +ExecStart={{ nodepool_pip_virtualenv | default('/usr/local') }}/bin/nodepool-builder -d $ARGS [Install] WantedBy=multi-user.target diff --git a/templates/etc/systemd/system/nodepool-launcher.service b/templates/etc/systemd/system/nodepool-launcher.service index 8b5a2f8..f3ff05c 100644 --- a/templates/etc/systemd/system/nodepool-launcher.service +++ b/templates/etc/systemd/system/nodepool-launcher.service @@ -6,12 +6,9 @@ After=syslog.target network.target Type=simple # Options to pass to nodepool-launcher. Environment="ARGS=-l /etc/nodepool/launcher-logging.conf --no-webapp" -# The prefix used when nodepool-launcher was installed. Be sure to update this -# value if you are using a virtualenv. -Environment="PREFIX=/usr/local" Group=nodepool User=nodepool -ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-launcher -d ${ARGS}" +ExecStart={{ nodepool_pip_virtualenv | default('/usr/local') }}/bin/nodepool-launcher -d $ARGS [Install] WantedBy=multi-user.target