Merge lp:~markwash/nova/ubuntu into lp:~openstack-ubuntu-packagers/nova/ubuntu

[Mark Washenberger]

[Chuck Short (zulcss)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-13 15:57:33 +0000
+++ debian/changelog	2011-10-24 19:43:23 +0000
@@ -20,6 +20,9 @@
     - debian/nova-common.postinst: Create 'nova' group, add user to it.
     - debian/nova-common.postinst: Restrict permissions of /var/log/nova
 
+  [ Mark Washenberger ]
+  * Add support for nova-console package.
+
  -- Monty Taylor <[e-mail]>  Fri, 30 Sep 2011 09:33:16 -0700
 
 nova (2011.3~rc~20110916.r1173-0ubuntu1) oneiric; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2011-10-13 15:57:33 +0000
+++ debian/control	2011-10-24 19:43:23 +0000
@@ -399,6 +399,28 @@
  This is the package contains a very simple S3-like object store.
  For production use, you should use OpenStack Storage, aka. Swift.
 
+Package: nova-console
+Architecture: all
+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Description: OpenStack Compute - Console
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ This package provides the console server.  This enables the use of consoles 
+ to be used along with XVP and XenServer.  It is a publically reachable
+ component which proxies access to VNCs running on compute nodes.
+
 Package: nova-doc
 Architecture: all
 Section: doc
 
=== added file 'debian/mans/nova-console.8'
--- debian/mans/nova-console.8	1970-01-01 00:00:00 +0000
+++ debian/mans/nova-console.8	2011-10-24 19:43:23 +0000
@@ -0,0 +1,20 @@
+.TH nova\-console 8
+.SH NAME
+nova\-console \- nova VNC console proxy
+
+.SH SYNOPSIS
+.B nova\-console
+.B \-\-flagfile=<flagfilepath>
+
+.SH DESCRIPTION
+.B nova\-console
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-flagfile=<flagfilepath>
+.IP
+
+Path to the file containing options.
 
=== added file 'debian/nova-console.init'
--- debian/nova-console.init	1970-01-01 00:00:00 +0000
+++ debian/nova-console.init	2011-10-24 19:43:23 +0000
@@ -0,0 +1,71 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nova-console
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: nova-console
+# Description:       Nova Console for XenServer and XVP
+### END INIT INFO
+
+
+set -e
+
+DAEMON=/usr/bin/nova-console
+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
+PIDFILE=/var/run/nova/nova-console.pid
+
+ENABLED=true
+
+if test -f /etc/default/nova-console; then
+  . /etc/default/nova-console
+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"
+
+if ! [ -x ${DAEMON} ] ; then
+	exit 0
+fi
+
+case "$1" in
+  start)
+    test "$ENABLED" = "true" || exit 0
+    log_daemon_msg "Starting nova console" "nova-console"
+    start-stop-daemon --start --chdir /var/run --chuid ${uid}:${gid} -b -m --pidfile ${PIDFILE} --exec ${DAEMON} -- ${DAEMON_ARGS}
+    log_end_msg $?
+    ;;
+  stop)
+    test "$ENABLED" = "true" || exit 0
+    log_daemon_msg "Stopping nova console" "nova-console"
+    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-console && exit 0 || exit $?
+    ;;
+  *)
+    log_action_msg "Usage: /etc/init.d/nova-console {start|stop|restart|force-reload|status}"
+    exit 1
+    ;;
+esac
+
+exit 0
 
=== added file 'debian/nova-console.install'
--- debian/nova-console.install	1970-01-01 00:00:00 +0000
+++ debian/nova-console.install	2011-10-24 19:43:23 +0000
@@ -0,0 +1,1 @@
+usr/bin/nova-console
 
=== added file 'debian/nova-console.logrotate'
--- debian/nova-console.logrotate	1970-01-01 00:00:00 +0000
+++ debian/nova-console.logrotate	2011-10-24 19:43:23 +0000
@@ -0,0 +1,5 @@
+/var/log/nova/nova-console.log {
+    daily
+    copytruncate
+    missingok
+}
 
=== added file 'debian/nova-console.manpages'
--- debian/nova-console.manpages	1970-01-01 00:00:00 +0000
+++ debian/nova-console.manpages	2011-10-24 19:43:23 +0000
@@ -0,0 +1,1 @@
+debian/mans/nova-console.8
 
=== added file 'debian/nova-console.upstart.in'
--- debian/nova-console.upstart.in	1970-01-01 00:00:00 +0000
+++ debian/nova-console.upstart.in	2011-10-24 19:43:23 +0000
@@ -0,0 +1,19 @@
+description "Nova Console"
+author "Vishvananda Ishaya <[e-mail]>"
+
+start on (filesystem and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+	mkdir -p /var/run/nova
+	chown nova:root /var/run/nova
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova
+end script
+
+exec su -c "nova-console --flagfile=/etc/nova/nova.conf" nova