diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
3 files changed, 150 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth new file mode 100644 index 00000000..13ad2855 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth @@ -0,0 +1,75 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: nova-consoleauth +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: libvirt-bin +# Should-Stop: libvirt-bin +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: nova-consoleauth service +# Description: Provides console services for the openstack +# cloud computing system +### END INIT INFO + + +set -e + +DAEMON=/usr/bin/nova-consoleauth +DAEMON_ARGS="" +PIDFILE=/var/run/nova/nova-consoleauth.pid + +ENABLED=true + +if test -f /etc/default/nova-consoleauth; then + . /etc/default/nova-consoleauth +fi + +mkdir -p /var/run/nova +chown nova:root /var/run/nova/ + +mkdir -p /var/lock/nova +chown nova:root /var/lock/nova/ + +#uid="$(getent passwd nova | cut -f3 -d:)" +#gid="$(getent passwd nova | cut -f4 -d:)" + +. /lib/lsb/init-functions + +export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" +export TMPDIR=/var/lib/nova/tmp + +if ! [ -x ${DAEMON} ] ; then + exit 0 +fi + +case "$1" in + start) + test "$ENABLED" = "true" || exit 0 + echo "Starting nova console" "nova-consoleauth" + start-stop-daemon --start -b -m --pidfile $PIDFILE --exec ${DAEMON} -- ${DAEMON_ARGS} + log_end_msg $? + ;; + stop) + test "$ENABLED" = "true" || exit 0 + echo "Stopping nova console" "nova-consoleauth" + start-stop-daemon --stop --oknodo --pidfile ${PIDFILE} + log_end_msg $? + ;; + restart|force-reload) + test "$ENABLED" = "true" || exit 1 + $0 stop + sleep 1 + $0 start + ;; + status) + test "$ENABLED" = "true" || exit 0 + status_of_proc -p $PIDFILE $DAEMON nova-consoleauth && exit 0 || exit $? + ;; + *) + echo "Usage: /etc/init.d/nova-consoleauth {start|stop|restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy new file mode 100644 index 00000000..76cd1df6 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy @@ -0,0 +1,72 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: nova-novncproxy +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: libvirt-bin +# Should-Stop: libvirt-bin +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: nova-novncproxy service +# Description: Provides vnc proxy services for the openstack +# cloud computing system +### END INIT INFO + + +set -e + +DAEMON=/usr/bin/nova-novncproxy +DAEMON_ARGS="" +PIDFILE=/var/run/nova/nova-novncproxy.pid + +ENABLED=true + +if test -f /etc/default/nova-novncproxy; then + . /etc/default/nova-novncproxy +fi + +mkdir -p /var/run/nova +chown nova:root /var/run/nova/ + +mkdir -p /var/lock/nova +chown nova:root /var/lock/nova/ + +. /lib/lsb/init-functions + +export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" +export TMPDIR=/var/lib/nova/tmp + +if ! [ -x ${DAEMON} ] ; then + exit 0 +fi + +case "$1" in + start) + test "$ENABLED" = "true" || exit 0 + echo "Starting nova vnc proxy" "nova-novncproxy" + start-stop-daemon --start -b -m --pidfile $PIDFILE --exec ${DAEMON} -- ${DAEMON_ARGS} + log_end_msg $? + ;; + stop) + test "$ENABLED" = "true" || exit 0 + echo "Stopping nova vnc proxy" "nova-novncproxy" + start-stop-daemon --stop --oknodo --pidfile ${PIDFILE} + log_end_msg $? + ;; + restart|force-reload) + test "$ENABLED" = "true" || exit 1 + $0 stop + sleep 1 + $0 start + ;; + status) + test "$ENABLED" = "true" || exit 0 + status_of_proc -p $PIDFILE $DAEMON nova-novncproxy && exit 0 || exit $? + ;; + *) + echo "Usage: /etc/init.d/nova-novncproxy {start|stop|restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf index 695f0845..20db54dc 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf @@ -22,7 +22,9 @@ glance_host = %CONTROLLER_IP% #VNC vnc_enabled = true -vncserver_listen = 0.0.0.0 +vncserver_listen = %COMPUTE_IP% +novncproxy_base_url=http://%CONTROLLER_IP%:6080/vnc_auto.html +vncserver_proxyclient_address=%COMPUTE_IP% #Network flat_interface = eth0 @@ -35,7 +37,6 @@ force_dhcp_release=False dhcpbridge=/usr/bin/nova-dhcpbridge #Database configuration -# sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/nova sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova #RabbitMQ configuration |