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

Proposed by JJ Asghar
Status: Superseded
Proposed branch: lp:~d-jj/ironic/ironic-conductor
Merge into: lp:ubuntu/vivid/ironic
Diff against target: 27 lines (+5/-5)
1 file modified
debian/ironic-conductor.init.in (+5/-5)
To merge this branch: bzr merge lp:~d-jj/ironic/ironic-conductor
Reviewer Review Type Date Requested Status
Ma Wen Cheng (community) Approve
Mark Vanderwiel (community) Approve
JJ Asghar Pending
Review via email: mp+253085@code.launchpad.net

This proposal supersedes a proposal from 2015-03-16.

This proposal has been superseded by a proposal from 2015-04-23.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Mark Vanderwiel (vanderwl) wrote :

Lgtm, thx JJ

review: Approve
Revision history for this message
Ma Wen Cheng (mars914) wrote :

it is a good fix

review: Approve

Unmerged revisions

14. By JJ Asghar

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ironic-conductor.init.in'
2--- debian/ironic-conductor.init.in 2015-01-12 09:39:03 +0000
3+++ debian/ironic-conductor.init.in 2015-03-16 17:11:45 +0000
4@@ -1,18 +1,18 @@
5 #!/bin/sh
6 ### BEGIN INIT INFO
7-# Provides: ironic-api
8+# Provides: ironic-conductor
9 # Required-Start: $network $local_fs $remote_fs $syslog
10 # Required-Stop: $remote_fs
11 # Should-Start: postgresql mysql keystone ntp rabbitmq-server
12 # Should-Stop: postgresql mysql keystone ntp rabbitmq-server
13 # Default-Start: 2 3 4 5
14 # Default-Stop: 0 1 6
15-# Short-Description: Baremetal API server
16-# Description: Frontend Baremetal (Ironic) API server
17+# Short-Description: Baremetal CONDUCTOR server
18+# Description: Frontend Baremetal (Ironic) CONDUCTOR server
19 ### END INIT INFO
20
21 # Author: Thomas Goirand <zigo@debian.org>
22
23-DESC="OpenStack Baremetal Service API"
24+DESC="OpenStack Baremetal Service CONDUCTOR"
25 PROJECT_NAME=ironic
26-NAME=ironic-api
27+NAME=ironic-conductor

Subscribers

People subscribed via source and target branches