Merge "Fix to run ccdb migrations on initial startup. For more info: h…

…ttp://support.cloudfoundry.com/entries/20666892-workaround-cloud-controller-fails-to-start-when-using-install-method-from-vcap-readme"
leto · Jan 6, 2012 · 9e49dce · 9e49dce
2 parents 71f3fe4 + 194717c
commit 9e49dce
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/vcap b/bin/vcap
@@ -41,12 +41,12 @@ class Component
     if core?
       @path = File.join(DIR, name)
       # Sane default for location of configuration file
-      @configuration_path ||= File.join(DIR, "..", name, "config", "#{name}.yml")
+      @configuration_path ||= File.expand_path(File.join(DIR, "..", name, "config", "#{name}.yml"))
     else
       @path = File.join(SERVICE_DIR, name)
       # Sane default for location of service configuration file
       pre = name.sub(/_node|_gateway/,'')
-      @configuration_path ||= File.join(DIR, "../services", pre, "config", "#{name}.yml")
+      @configuration_path ||= File.expand_path(File.join(DIR, "../services", pre, "config", "#{name}.yml"))
     end
   end