From bc807281269a6f1325253ff9d1968604c3a40f00 Mon Sep 17 00:00:00 2001
From: Martin Englund <martin@englund.nu>
Date: Mon, 25 Jun 2012 15:42:27 -0700
Subject: [PATCH] micro jobs need cpi name appended

- relies on change in stemcell builder and bosh/package_compiler
  to pick the right cpi

Change-Id: If88b63a690f40cad66eb8daa027437816dd42082
---
 .gitignore                            | 9 +++------
 jobs/{micro => micro_vsphere}/prepare | 7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename jobs/{micro => micro_vsphere}/prepare (94%)

diff --git a/.gitignore b/.gitignore
index a5b8296..98adaec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,7 @@
 .idea
-jobs/micro/monit
-jobs/micro/spec
-jobs/micro/templates/
-jobs/micro_aws/monit
-jobs/micro_aws/spec
-jobs/micro_aws/templates/
+jobs/micro_*/monit
+jobs/micro_*/spec
+jobs/micro_*/templates/
 config/dev.yml
 config/private.yml
 releases/*.tgz
diff --git a/jobs/micro/prepare b/jobs/micro_vsphere/prepare
similarity index 94%
rename from jobs/micro/prepare
rename to jobs/micro_vsphere/prepare
index 3c275c1..832f0c7 100755
--- a/jobs/micro/prepare
+++ b/jobs/micro_vsphere/prepare
@@ -7,6 +7,7 @@ require 'erb'
 TEMPLATES = "templates"
 OVERRIDE = "override"
 
+MICRO="micro_vsphere"
 
 def job_dir(job)
   File.expand_path("../../#{job}", __FILE__)
@@ -16,7 +17,7 @@ end
 jobs = %w[ nats redis postgres blobstore director health_monitor ]
 
 spec = {
-  "name" => "micro",
+  "name" => MICRO,
   "templates" => {
     "post_install" => "bin/post_install"
   },
@@ -91,10 +92,10 @@ for DIR in /var/vcap/jobs /var/vcap/data/jobs; do
   cd $DIR
   for JOB in <%= jobs.join(" ") %>; do
     mkdir -p ${JOB}/bin ${JOB}/config
-    for FILE in micro/$JOB/bin/*; do
+    for FILE in <%= MICRO %>/$JOB/bin/*; do
       ln -nsf ../../$FILE $JOB/bin
     done
-    for FILE in micro/$JOB/config/*; do
+    for FILE in <%= MICRO %>/$JOB/config/*; do
       ln -nsf ../../$FILE $JOB/config
     done
   done