[openstack-nova/el6] adjust to the essex VNC service changes

[Pádraig Brady]

commit fbf935c5bac0c3af9df1e7c59f7e258000a85ac4
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 19 18:12:48 2012 +0100

    adjust to the essex VNC service changes
    
    There are now three services rather than one,
    as detailed in the vnc-console-cleanup blueprint

 ...va-vncproxy.init => openstack-nova-console.init |   10 +++++-----
 ...ncproxy.init => openstack-nova-consoleauth.init |   10 +++++-----
 ...ncproxy.init => openstack-nova-xvpvncproxy.init |   10 +++++-----
 openstack-nova.spec                                |    9 +++++++--
 4 files changed, 22 insertions(+), 17 deletions(-)
---
diff --git a/openstack-nova-vncproxy.init b/openstack-nova-console.init
similarity index 87%
copy from openstack-nova-vncproxy.init
copy to openstack-nova-console.init
index 14eb4e0..981bd25 100644
--- a/openstack-nova-vncproxy.init
+++ b/openstack-nova-console.init
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# openstack-nova-vncproxy  OpenStack Nova Console VNC Proxy
+# openstack-nova-console  OpenStack Nova Console Proxy
 #
 # chkconfig:   - 20 80
-# description: OpenStack Nova Console VNC Proxy Server
+# description: OpenStack Nova Console Proxy Server
 
 ### BEGIN INIT INFO
 # Provides:
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $syslog
 # Default-Stop: 0 1 6
-# Short-Description: OpenStack Nova Console VNC Proxy
-# Description: OpenStack Nova Console VNC Proxy Server
+# Short-Description: OpenStack Nova Console Proxy
+# Description: OpenStack Nova Console Proxy Server
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
 
-suffix=vncproxy
+suffix=console
 prog=openstack-nova-$suffix
 exec="/usr/bin/nova-$suffix"
 config="/etc/nova/nova.conf"
diff --git a/openstack-nova-vncproxy.init b/openstack-nova-consoleauth.init
similarity index 87%
copy from openstack-nova-vncproxy.init
copy to openstack-nova-consoleauth.init
index 14eb4e0..bf32c0c 100644
--- a/openstack-nova-vncproxy.init
+++ b/openstack-nova-consoleauth.init
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# openstack-nova-vncproxy  OpenStack Nova Console VNC Proxy
+# openstack-nova-console  OpenStack Nova Console Auth Proxy
 #
 # chkconfig:   - 20 80
-# description: OpenStack Nova Console VNC Proxy Server
+# description: OpenStack Nova Console Auth Proxy Server
 
 ### BEGIN INIT INFO
 # Provides:
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $syslog
 # Default-Stop: 0 1 6
-# Short-Description: OpenStack Nova Console VNC Proxy
-# Description: OpenStack Nova Console VNC Proxy Server
+# Short-Description: OpenStack Nova Console Auth Proxy
+# Description: OpenStack Nova Console Auth Proxy Server
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
 
-suffix=vncproxy
+suffix=consoleauth
 prog=openstack-nova-$suffix
 exec="/usr/bin/nova-$suffix"
 config="/etc/nova/nova.conf"
diff --git a/openstack-nova-vncproxy.init b/openstack-nova-xvpvncproxy.init
similarity index 86%
rename from openstack-nova-vncproxy.init
rename to openstack-nova-xvpvncproxy.init
index 14eb4e0..ac0656d 100644
--- a/openstack-nova-vncproxy.init
+++ b/openstack-nova-xvpvncproxy.init
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# openstack-nova-vncproxy  OpenStack Nova Console VNC Proxy
+# openstack-nova-xvpvncproxy  OpenStack Nova Console XVP VNC Proxy
 #
 # chkconfig:   - 20 80
-# description: OpenStack Nova Console VNC Proxy Server
+# description: OpenStack Nova Console XVP VNC Proxy Server
 
 ### BEGIN INIT INFO
 # Provides:
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $syslog
 # Default-Stop: 0 1 6
-# Short-Description: OpenStack Nova Console VNC Proxy
-# Description: OpenStack Nova Console VNC Proxy Server
+# Short-Description: OpenStack Nova Console XVP VNC Proxy
+# Description: OpenStack Nova Console XVP VNC Proxy Server
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
 
-suffix=vncproxy
+suffix=xvpvncproxy
 prog=openstack-nova-$suffix
 exec="/usr/bin/nova-$suffix"
 config="/etc/nova/nova.conf"
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 71c8453..17bd794 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -20,7 +20,9 @@ Source14:         openstack-nova-objectstore.init
 Source15:         openstack-nova-scheduler.init
 Source16:         openstack-nova-volume.init
 Source17:         openstack-nova-direct-api.init
-Source19:         openstack-nova-vncproxy.init
+Source18:         openstack-nova-xvpvncproxy.init
+Source19:         openstack-nova-console.init
+Source24:         openstack-nova-consoleauth.init
 
 Source20:         nova-sudoers
 Source21:         nova-polkit.pkla
@@ -274,7 +276,9 @@ install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/openstack-nova-object
 install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/openstack-nova-scheduler
 install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/openstack-nova-volume
 install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/openstack-nova-direct-api
-install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/openstack-nova-vncproxy
+install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/openstack-nova-xvpvncproxy
+install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/openstack-nova-console
+install -p -D -m 755 %{SOURCE24} %{buildroot}%{_initrddir}/openstack-nova-consoleauth
 
 # Install sudoers
 install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/nova
@@ -397,6 +401,7 @@ fi
 - Sync up with Essex stable branch
 - Support more flexible guest image file injection
 - Enforce quota on security group rules (#814275, CVE-2012-2101)
+- Provide startup scripts for the Essex VNC services
 
 * Fri Apr 13 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-1
 - Update to Essex release