Merge "add mongodb 2.0 in cf-release"

cloudfoundry-attic · Oct 11, 2012 · 06c9c12 · 06c9c12
2 parents 01b9dfa + 6726282
commit 06c9c12
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/jobs/mongodb_node_ng/templates/mongod_startup.sh b/jobs/mongodb_node_ng/templates/mongod_startup.sh
@@ -8,4 +8,12 @@ done
 
 touch /store/log/mongodb.log
 mkdir -p /store/instance/data
-exec /usr/bin/mongod --config /etc/mongodb.conf
+
+# mongod_startup.sh 1.8
+# mongod_startup.sh 1.8 --journal
+# mongod_startup.sh 2.0
+# mongod_startup.sh 2.0 --nojournal
+version=$1
+shift
+args=$*
+exec /usr/share/mongodb/mongodb-$version/mongod $args --config /etc/mongodb.conf
diff --git a/jobs/mongodb_node_ng/templates/mongodb_node.yml.erb b/jobs/mongodb_node_ng/templates/mongodb_node.yml.erb
@@ -37,8 +37,16 @@ mongod_path:
 <% end %>
 
 mongod_options:
+  <% if plan_enabled && plan_conf.enable_journaling %>
+  "1.8": "--journal"
+  <% else %>
   "1.8": ""
+  <% end %>
+  <% if plan_enabled && plan_conf.enable_journaling %>
+  "2.0": ""
+  <% else %>
   "2.0": "--nojournal"
+  <% end %>
 
 port_range:
   first: 25001

diff --git a/jobs/mongodb_node_ng/templates/warden_ctl b/jobs/mongodb_node_ng/templates/warden_ctl
@@ -2,7 +2,8 @@
 
 JOB_DIR=/var/vcap/jobs/mongodb_node_ng
 PKG_DIR=/var/vcap/packages/mongodb_node_ng
-BIN_DIR=/var/vcap/packages/mongodb18/bin
+BIN_MONGO_1dot8_DIR=/var/vcap/packages/mongodb18/bin
+BIN_MONGO_2dot0_DIR=/var/vcap/packages/mongodb20/bin
 
 source /var/vcap/packages/mongodb_node_ng/common/services/utils.sh
 
@@ -11,8 +12,13 @@ case $1 in
   start)
     setup_warden
 
+    mkdir -p $ROOT_DIR/usr/share/mongodb/mongodb-1.8
+    mkdir -p $ROOT_DIR/usr/share/mongodb/mongodb-2.0
+
     # Copy mongodb binaries and configuration files to warden base file system
-    install -m 0755 -t $ROOT_DIR/usr/bin $JOB_DIR/bin/mongod_startup.sh $BIN_DIR/*
+    install -m 0755 -t $ROOT_DIR/usr/bin $JOB_DIR/bin/mongod_startup.sh
+    install -m 0755 -t $ROOT_DIR/usr/share/mongodb/mongodb-1.8 $BIN_MONGO_1dot8_DIR/*
+    install -m 0755 -t $ROOT_DIR/usr/share/mongodb/mongodb-2.0 $BIN_MONGO_2dot0_DIR/*
     install -m 0644 -t $ROOT_DIR/etc     $JOB_DIR/config/mongodb.conf
     install -m 0644 -t $ROOT_DIR/etc/init    $JOB_DIR/config/services.conf