Merge lp:~gandelman-a/ubuntu/saucy/nova/pyparsing_min into lp:~ubuntu-server-dev/nova/havana

[Adam Gandelman]

[lp:~gandelman-a/ubuntu/saucy/nova/pyparsing_min]

588. By Adam Gandelman on 2013-07-02

Add websockify to nova-spiceproxy Depends.

589. By Adam Gandelman on 2013-07-02

Add nova-xvpvncproxy upstart (LP: #1197163)

590. By Adam Gandelman on 2013-07-02

Add spice-html5 to nova-spiceproxy Depends (LP: #1197119)

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-19 18:00:13 +0000
+++ debian/changelog	2013-07-02 22:31:31 +0000
@@ -1,3 +1,13 @@
+nova (1:2013.2~b1-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Set version requirement python-pyparsing (>= 1.5.6).
+    - Add websockify to nova-spiceproxy Depends.
+    - Add spice-html5 to nova-spiceproxy Depends (LP: #1197119)
+  * Add nova-xvpvncproxy upstart (LP: #1197163)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 02 Jul 2013 11:12:26 -0700
+
 nova (1:2013.2~b1-0ubuntu2) saucy; urgency=low
 
   [Yolanda Robla]

=== modified file 'debian/control'
--- debian/control	2013-06-15 00:25:07 +0000
+++ debian/control	2013-07-02 22:31:31 +0000
@@ -36,6 +36,7 @@
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.5.11),
  python-pyasn1,
+ python-pyparsing (>= 1.5.6),
  python-quantumclient,
  python-routes,
  python-setuptools,
@@ -85,6 +86,7 @@
  python-novaclient (>= 1:2.9.0),
  python-paste,
  python-pastedeploy,
+ python-pyparsing (>= 1.5.6),
  python-pycurl,
  python-routes,
  python-simplejson,
@@ -554,6 +556,8 @@
 Package: nova-spiceproxy
 Architecture: all
 Depends: nova-common (= ${binary:Version}),
+ websockify,
+ spice-html5,
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}

=== added file 'debian/nova-xvpvncproxy.upstart'
--- debian/nova-xvpvncproxy.upstart	1970-01-01 00:00:00 +0000
+++ debian/nova-xvpvncproxy.upstart	2013-07-02 22:31:31 +0000
@@ -0,0 +1,17 @@
+description "Nova XVPVNC proxy"
+author "Adam Gandelman <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+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 start-stop-daemon --start --chuid nova --exec /usr/bin/nova-xvpvncproxy -- --config-file=/etc/nova/nova.conf