Merge lp:~gz/juju-core/revert_upstart_mongodb_1286279 into lp:~go-bot/juju-core/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Dimiter Naydenov | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 2396 | ||||
| Proposed branch: | lp:~gz/juju-core/revert_upstart_mongodb_1286279 | ||||
| Merge into: | lp:~go-bot/juju-core/trunk | ||||
| Diff against target: |
24 lines (+1/-6) 1 file modified
agent/mongo/mongo.go (+1/-6) |
||||
| To merge this branch: | bzr merge lp:~gz/juju-core/revert_upstart_mongodb_1286279 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
agent/mongo: Revert attempted use of juju-mongodb
Currently upstart scripts are generated on the client and included in
the cloud-init data. The change to check for the existence of the new
juju-mongodb package breaks remote bootstrap, as it will see the
alternative location locally with a stat, then generate an upstart file
that the spawned machine cannot use. This branch reverts to using a hard
coded path where mongod can be found.
https:/
R=jameinel, natefinch
Description of the change
agent/mongo: Revert attempted use of juju-mongodb
Currently upstart scripts are generated on the client and included in
the cloud-init data. The change to check for the existence of the new
juju-mongodb package breaks remote bootstrap, as it will see the
alternative location locally with a stat, then generate an upstart file
that the spawned machine cannot use. This branch reverts to using a hard
coded path where mongod can be found.
Future work will cover moving the upstart script generatation off the
the client and onto the server so it can actually do the right thing.
| Martin Packman (gz) wrote | # |
| John A Meinel (jameinel) wrote | # |
| Nate Finch (natefinch) wrote | # |
| Go Bot (go-bot) wrote | # |
Reviewers: mp+209959_
Message:
Please take a look.
Description:
agent/mongo: Revert attempted use of juju-mongodb
Currently upstart scripts are generated on the client and included in
the cloud-init data. The change to check for the existence of the new
juju-mongodb package breaks remote bootstrap, as it will see the
alternative location locally with a stat, then generate an upstart file
that the spawned machine cannot use. This branch reverts to using a hard
coded path where mongod can be found.
Future work will cover moving the upstart script generatation off the
the client and onto the server so it can actually do the right thing.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+3, -6 lines):
A [revision details]
M agent/mongo/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: agent/mongo/
=== modified file 'agent/
--- agent/mongo/
+++ agent/mongo/
@@ -139,11 +139,6 @@
dbDir := path.Join(dataDir, "db")
- mongodpath, err := MongodPath()
- if err != nil {
- return nil, err
- }
-
conf := &upstart.Conf{
Service: *svc,
Desc: "juju state database",
@@ -151,7 +146,7 @@
"nofile": fmt.Sprintf("%d %d", maxFiles, maxFiles),
"nproc": fmt.Sprintf("%d %d", maxProcs, maxProcs),
},
- Cmd: mongodpath +
+ Cmd: "/usr/bin/mongod" +
" --auth" +
" --dbpath=" + dbDir +
" --sslOnNormalPorts" +