Remove PREFIX from service files
This was really to work around the need not to template our service files. Mostly because I was scared how large and unmanageable they would become. Let ansible do its job and remove the hacks we had in our systemd unit file. Change-Id: I92a4167900bbf48d564207017a9790d4102f937f Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
9105363441
commit
663e9ce11c
|
@ -6,12 +6,9 @@ After=syslog.target network.target
|
||||||
Type=simple
|
Type=simple
|
||||||
# Options to pass to nodepool-builder.
|
# Options to pass to nodepool-builder.
|
||||||
Environment="ARGS=-l /etc/nodepool/builder-logging.conf"
|
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
|
Group=nodepool
|
||||||
User=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]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -6,12 +6,9 @@ After=syslog.target network.target
|
||||||
Type=simple
|
Type=simple
|
||||||
# Options to pass to nodepool-launcher.
|
# Options to pass to nodepool-launcher.
|
||||||
Environment="ARGS=-l /etc/nodepool/launcher-logging.conf --no-webapp"
|
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
|
Group=nodepool
|
||||||
User=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]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
Loading…
Reference in New Issue