bin/forj in forj-0.0.16 vs bin/forj in forj-0.0.17

- old
+ new

@@ -59,11 +59,23 @@ puts ' openstack_auth_url: your openstack identity endpoint' puts '' end desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint' + method_option :build_conf_dir, :aliases => '-c', :desc => 'build config dir to use' + method_option :branch, :aliases => '-b', :desc => 'branch to use' def boot(blueprint, on, cloud_provider, as, name, test=false) - Boot.boot(blueprint, cloud_provider, name, test) + build_conf_dir = options[:build_conf_dir] + branch = options[:branch] + unless branch + branch = 'master' + end + if options[:build_conf_dir] + Boot.boot(blueprint, cloud_provider, name, build_conf_dir, branch, test) + else + Boot.boot(blueprint, cloud_provider, name, nil, nil, test) + end + end desc 'down', 'delete the Maestro box and all systems installed by the blueprint' def down(name) Down.down(name) \ No newline at end of file