openstack/manila-image-elements
Code Issues Proposed changes

Add systemd support to manila-ssh

Browse Source 
Because we're using ubuntu-minimal there is no cloud init support and
we have manila-ssh as a substitute. Manila-ssh was only designed to
work with upstart. This patch adds systemd support.

Change-Id: Id43dc8effb846dcaf68b50eace68df8a076899a1
This commit is contained in:
Ben Swartzlander 2017-09-26 14:13:11 -04:00
parent 56c5f46a4d
commit ffabcc1a59
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/manila-ssh/install.d/60-fetch-public-ssh-keys
View File

@ -13,6 +13,9 @@ install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.sh /usr/lo
DIB_INIT_SYSTEM=$(dib-init-system) DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.conf /etc/init/fetch-public-ssh-keys.conf install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.conf /etc/init/fetch-public-ssh-keys.conf
elif [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/fetch-public-ssh-keys.service /etc/systemd/system
systemctl enable fetch-public-ssh-keys
else else
echo "Not supported" echo "Not supported"
fi fi

9
elements/manila-ssh/install.d/fetch-public-ssh-keys.service Normal file
View File

@ -0,0 +1,9 @@
[Unit]
Description=Fetch Public Keys
After=network.target
[Service]
ExecStart=/usr/local/sbin/fetch-public-ssh-keys.sh
[Install]
WantedBy=multi-user.target