gistfile1

commit 9d5cb9213493160c6df97bd527bd597e648901fa
Author: Vishvananda Ishaya <[email protected]>
Date:   Mon Sep 10 21:29:06 2012 -0700

    fix nova-novncproxy package and dependencies
    
    Change-Id: Ib5af0fdde528247b4634b5a18933f6eb9f260047

diff --git a/debian/control b/debian/control
index 1f6a702..9748a42 100644
--- a/debian/control
+++ b/debian/control
@@ -421,11 +421,31 @@ Description: OpenStack Compute - AJAX console proxy - transitional package
  .
  This package used to provide the AJAX proxy, which is now gone.
 
-Package: nova-vncproxy
+Package: nova-novncproxy
+Architecture: all
+Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), novnc, ${python:Depends}, ${misc:Depends}
+Description: OpenStack Compute - NoVNC proxy
+ 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 VNC proxy. It is a publically reachable
+ component which proxies access to VNCs running on compute nodes.
+
+Package: nova-xvpvncproxy
 Architecture: all
 Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Conflicts: novnc
-Description: OpenStack Compute - VNC proxy
+Description: OpenStack Compute - XVP VNC proxy
  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
diff --git a/debian/mans/nova-novncproxy.8 b/debian/mans/nova-novncproxy.8
new file mode 100644
index 0000000..5405a21
--- /dev/null
+++ b/debian/mans/nova-novncproxy.8
@@ -0,0 +1,20 @@
+.TH nova\-novncproxy 8
+.SH NAME
+nova\-novncproxy \- nova NoVNC console proxy
+
+.SH SYNOPSIS
+.B nova\-novncproxy
+.B \-\-config-file=<config-filepath>
+
+.SH DESCRIPTION
+.B nova\-novncproxy
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-config-file=<config-filepath>
+.IP
+
+Path to the file containing options.
diff --git a/debian/mans/nova-vncproxy.8 b/debian/mans/nova-vncproxy.8
deleted file mode 100644
index 784139d..0000000
--- a/debian/mans/nova-vncproxy.8
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH nova\-vncproxy 8
-.SH NAME
-nova\-vncproxy \- nova VNC console proxy
-
-.SH SYNOPSIS
-.B nova\-vncproxy
-.B \-\-config-file=<config-filepath>
-
-.SH DESCRIPTION
-.B nova\-vncproxy
-
-This man page is a stub. Please contribute.
-
-.SH PARAMETERS
-
-.LP
-.B \-\-config-file=<config-filepath>
-.IP
-
-Path to the file containing options.
diff --git a/debian/mans/nova-xvpvncproxy.8 b/debian/mans/nova-xvpvncproxy.8
new file mode 100644
index 0000000..58c8d47
--- /dev/null
+++ b/debian/mans/nova-xvpvncproxy.8
@@ -0,0 +1,20 @@
+.TH nova\-xvpvncproxy 8
+.SH NAME
+nova\-xvpvncproxy \- nova XVP VNC console proxy
+
+.SH SYNOPSIS
+.B nova\-xvpvncproxy
+.B \-\-config-file=<config-filepath>
+
+.SH DESCRIPTION
+.B nova\-xvpvncproxy
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-config-file=<config-filepath>
+.IP
+
+Path to the file containing options.
diff --git a/debian/nova-novncproxy.install b/debian/nova-novncproxy.install
new file mode 100644
index 0000000..20eec0e
--- /dev/null
+++ b/debian/nova-novncproxy.install
@@ -0,0 +1 @@
+usr/bin/nova-novncproxy
diff --git a/debian/nova-novncproxy.logrotate b/debian/nova-novncproxy.logrotate
new file mode 100644
index 0000000..f7ea45e
--- /dev/null
+++ b/debian/nova-novncproxy.logrotate
@@ -0,0 +1,4 @@
+/var/log/nova/nova-novncproxy.log {
+    daily
+    missingok
+}
diff --git a/debian/nova-novncproxy.manpages b/debian/nova-novncproxy.manpages
new file mode 100644
index 0000000..4d4921a
--- /dev/null
+++ b/debian/nova-novncproxy.manpages
@@ -0,0 +1 @@
+debian/mans/nova-novncproxy.8
diff --git a/debian/nova-novncproxy.upstart.in b/debian/nova-novncproxy.upstart.in
new file mode 100644
index 0000000..be2e155
--- /dev/null
+++ b/debian/nova-novncproxy.upstart.in
@@ -0,0 +1,18 @@
+description "Nova No VNC proxy"
+author "Vishvananda Ishaya <[email protected]>"
+
+start on (filesystem and net-device-up IFACE!=lo)
+stop on runlevel [016]
+
+
+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 -s /bin/sh -c "exec nova-novncproxy --config-file=/etc/nova/nova.conf" nova
diff --git a/debian/nova-vncproxy.install b/debian/nova-vncproxy.install
deleted file mode 100644
index 4b07b9c..0000000
--- a/debian/nova-vncproxy.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/nova-xvpvncproxy
diff --git a/debian/nova-vncproxy.logrotate b/debian/nova-vncproxy.logrotate
deleted file mode 100644
index 398b320..0000000
--- a/debian/nova-vncproxy.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/nova/nova-vncproxy.log {
-    daily
-    missingok
-}
diff --git a/debian/nova-vncproxy.manpages b/debian/nova-vncproxy.manpages
deleted file mode 100644
index c4651d6..0000000
--- a/debian/nova-vncproxy.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/mans/nova-vncproxy.8
diff --git a/debian/nova-vncproxy.upstart.in b/debian/nova-vncproxy.upstart.in
deleted file mode 100644
index a080d4c..0000000
--- a/debian/nova-vncproxy.upstart.in
+++ /dev/null
@@ -1,18 +0,0 @@
-description "Nova VNC proxy"
-author "Vishvananda Ishaya <[email protected]>"
-
-start on (filesystem and net-device-up IFACE!=lo)
-stop on runlevel [016]
-
-
-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 -s /bin/sh -c "exec nova-xvpvncproxy --config-file=/etc/nova/nova.conf" nova
diff --git a/debian/nova-xvpvncproxy.logrotate b/debian/nova-xvpvncproxy.logrotate
index 1526551..c10ec6a 100644
--- a/debian/nova-xvpvncproxy.logrotate
+++ b/debian/nova-xvpvncproxy.logrotate
@@ -1,4 +1,4 @@
-/var/log/nova/nova-vncproxy.log {
+/var/log/nova/nova-xvpvncproxy.log {
     daily
     missingok
-}
\ No newline at end of file
+}
diff --git a/debian/nova-xvpvncproxy.manpages b/debian/nova-xvpvncproxy.manpages
new file mode 100644
index 0000000..603e5dd
--- /dev/null
+++ b/debian/nova-xvpvncproxy.manpages
@@ -0,0 +1 @@
+debian/mans/nova-xvpvncproxy.8