openstack
/
tripleo-image-elements
Code Issues Proposed changes

Ability to add *-create-dir service separately 

For systemd services, we create 2 services: one for the daemon and one
that creates the run directory under /var/run for the daemon.

For the packaged installs, the daemon service is already provided by the
package, so we need the ability to add just the *-create-dir service.

Some might say that the package should create it's run directory...and
it in fact does. However, we are reconfiguring the services to use
/var/run and the package uses /var/lib. Since /var/run is tmpfs mounted,
we need the *-create-dir services for the packages as well.

Change-Id: If26d9d7da04d3d1d97809db0e21e54dd9f8042ca
This commit is contained in:
James Slagle 2014-01-31 13:34:53 -05:00
parent a84a463983
commit 8475d117d7
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elements/os-svc-install/bin/os-svc-daemon
View File

@ -12,6 +12,8 @@ usage() {
echo ""
echo " -h Show help and exit"
echo " -p Print the job file instead of writing to disk"
echo " -d Only create the systemd service that creates the run time directory,"
echo " not the actual systemd daemon service. Ignored for upstart."
echo " -s POSTSTART post_start will be added to the upstart job. Ignored with systemd."
echo " default: $DEFAULT_POSTSTART"
echo " -e ENV Environment name=value entries to set in the service/job"
@ -27,6 +29,7 @@ SERVICENAME=${SERVICENAME:-""}
RUNAS=${RUNAS:-""}
RUNCMD=${RUNCMD:-""}
ENV=${ENV:-""}
CREATE_DIR_ONLY=${CREATE_DIR_ONLY:-""}
# The default helps avoid race with daemon listening. http://pad.lv/1179766
POSTSTART=${POSTSTART:-$DEFAULT_POSTSTART}
@ -41,7 +44,7 @@ print_to_file() {
OUTPUT=print_to_file
nshift=0
while getopts "phs:n:u:c:e:" opt; do
while getopts "phds:n:u:c:e:" opt; do
case "$opt" in
n) SERVICENAME=$OPTARG;;
u) RUNAS=$OPTARG;;
@ -49,6 +52,7 @@ while getopts "phs:n:u:c:e:" opt; do
s) POSTSTART=$OPTARG;;
e) ENV=$OPTARG;;
p) OUTPUT=print_only;;
d) CREATE_DIR_ONLY=1;;
h) usage; exit 0;;
\?) usage; exit 1;;
:) usage; exit 1;;
@ -137,13 +141,22 @@ WantedBy=multi-user.target
Alias=$name.service
EOF
}
function install_create_dir_systemd {
local name=$(map-services $1)
local user=$2
$OUTPUT /usr/lib/systemd/system/$name-create-dir.service <<EOF
[Unit]
Description=Create /var/run/$name
Description=Create /var/run/$user
[Service]
ExecStartPre=/bin/mkdir -p /var/run/$user
ExecStart=/bin/chown -R $user:$user /var/run/$user
[Install]
RequiredBy=$name.service
EOF
}
@ -156,5 +169,8 @@ elif [ "$DIB_INIT_SYSTEM" == "systemd" ]; then
if [ "$POSTSTART" != "$DEFAULT_POSTSTART" ] ; then
echo "WARNING: post start is ignored with systemd." >&2
fi
install_systemd $SERVICENAME $RUNAS $RUNCMD $*
if [ -z "$CREATE_DIR_ONLY" ]; then
install_systemd $SERVICENAME $RUNAS $RUNCMD $*
fi
install_create_dir_systemd $SERVICENAME $RUNAS
fi

7
elements/os-svc-install/bin/os-svc-enable
View File

@ -50,7 +50,12 @@ function enable_upstart_service {
function enable_systemd_service {
local name=$1
systemctl enable $(map-services $name).service
local service_name=$(map-services $name)
systemctl enable $service_name.service
# Also enable the create-dir service if it exists
if [ -f /usr/lib/systemd/system/$service_name-create-dir.service ]; then
systemctl enable $service_name-create-dir.service
fi
}
# TODO: SysV init fallback support