Merge lp:~d-jj/ironic/ironic-conductor into lp:ubuntu/vivid/ironic

[JJ Asghar]

The ironic conductor init script doesn't point to the conductor application, it points to the ironic-api. This fixes that.

[Mark Vanderwiel (vanderwl)]

Lgtm, thx JJ

review: Approve

[Ma Wen Cheng (mars914)]

it is a good fix

review: Approve

Unmerged revisions

14. By JJ Asghar on 2015-03-16

Updated the conductor.init script to look at the conductor instead of the api

=== modified file 'debian/ironic-conductor.init.in'
--- debian/ironic-conductor.init.in	2015-01-12 09:39:03 +0000
+++ debian/ironic-conductor.init.in	2015-03-16 17:11:45 +0000
@@ -1,18 +1,18 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          ironic-api
+# Provides:          ironic-conductor
 # Required-Start:    $network $local_fs $remote_fs $syslog
 # Required-Stop:     $remote_fs
 # Should-Start:      postgresql mysql keystone ntp rabbitmq-server
 # Should-Stop:       postgresql mysql keystone ntp rabbitmq-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Baremetal API server
-# Description:       Frontend Baremetal (Ironic) API server
+# Short-Description: Baremetal CONDUCTOR server
+# Description:       Frontend Baremetal (Ironic) CONDUCTOR server
 ### END INIT INFO
 
 # Author: Thomas Goirand <[e-mail]>
 
-DESC="OpenStack Baremetal Service API"
+DESC="OpenStack Baremetal Service CONDUCTOR"
 PROJECT_NAME=ironic
-NAME=ironic-api
+NAME=ironic-conductor