openstack
/
murano
Code Issues Proposed changes

Merge "Change incorrect murano-agent bin file location"

This commit is contained in:
Jenkins 2016-05-23 12:16:13 +00:00 committed by Gerrit Code Review
parent 3a31b844ab 15df963544
commit 42baab20f2
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/io.murano/Resources/murano-agent
View File

@ -8,7 +8,7 @@
# Description: murano-agent service
### END INIT INFO
SCRIPT="/usr/bin/muranoagent --config-dir /etc/murano"
SCRIPT="/usr/local/bin/muranoagent --config-dir /etc/murano"
RUNAS=root
PIDFILE=/var/run/murano.pid

2
meta/io.murano/Resources/murano-agent.conf
View File

@ -11,4 +11,4 @@ console none
exec start-stop-daemon --start -c root --exec /usr/local/bin/muranoagent -- --config-dir /etc/murano 2>&1 | logger -t murano-agent
post-start exec sleep 1
post-start exec sleep 1

2
meta/io.murano/Resources/murano-agent.service
View File

@ -7,4 +7,4 @@ ExecStart=/usr/local/bin/muranoagent --config-dir /etc/murano
Restart=on-failure
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

11
meta/io.murano/Resources/murano-init.sh
View File

@ -1,6 +1,10 @@
#!/bin/sh
ps cax | grep muranoagent > /dev/null
if [ -d /opt/stack/venvs/murano-agent ] && [ ! -f /usr/local/bin/muranoagent ]; then
ln -s /opt/stack/venvs/murano-agent/bin/muranoagent /usr/local/bin/muranoagent
fi
which muranoagent > /dev/null
if [ $? -eq 0 ]; then
echo "murano-agent service exists"
else
@ -13,8 +17,3 @@ else
chmod +x /etc/init.d/murano-agent
pip install murano-agent
fi