Ironic

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

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

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

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

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 : Posted in a previous version of this proposal

Lgtm, thx JJ

review: Approve
Revision history for this message
Ma Wen Cheng (mars914) wrote : Posted in a previous version of this proposal

it is a good fix

review: Approve
Revision history for this message
JJ Asghar (d-jj) :
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
=== modified file 'debian/ironic-conductor.init.in'
--- debian/ironic-conductor.init.in 2015-03-30 11:14:57 +0000
+++ debian/ironic-conductor.init.in 2015-04-23 19:45:39 +0000
@@ -7,12 +7,17 @@
7# Should-Stop: postgresql mysql keystone ntp rabbitmq-server7# Should-Stop: postgresql mysql keystone ntp rabbitmq-server
8# Default-Start: 2 3 4 58# Default-Start: 2 3 4 5
9# Default-Stop: 0 1 69# Default-Stop: 0 1 6
10<<<<<<< TREE
10# Short-Description: Baremetal Conductor server11# Short-Description: Baremetal Conductor server
11# Description: Frontend Baremetal (Ironic) API server12# Description: Frontend Baremetal (Ironic) API server
13=======
14# Short-Description: Baremetal CONDUCTOR server
15# Description: Frontend Baremetal (Ironic) CONDUCTOR server
16>>>>>>> MERGE-SOURCE
12### END INIT INFO17### END INIT INFO
1318
14# Author: Thomas Goirand <zigo@debian.org>19# Author: Thomas Goirand <zigo@debian.org>
1520
16DESC="OpenStack Baremetal Service API"21DESC="OpenStack Baremetal Service CONDUCTOR"
17PROJECT_NAME=ironic22PROJECT_NAME=ironic
18NAME=ironic-api23NAME=ironic-conductor

Subscribers

People subscribed via source and target branches