lib/chef/knife/topo_create.rb in knife-topo-0.0.5 vs lib/chef/knife/topo_create.rb in knife-topo-0.0.6

@@ -38,16 +38,16 @@
       :description => "The data bag the topologies are stored in"
 
       option :bootstrap,
       :long => "--bootstrap",
       :description => "Whether to bootstrap newly created nodes",
-      :boolean => false
+      :boolean => true
 
-      option :no_upload,
-      :long => "--no-upload",
-      :description => "Do not upload cookbooks",
-      :boolean => false
+      option :disable_upload,
+      :long => "--disable-upload",
+      :description => "Do not upload topo cookbooks",
+      :boolean => true
             
       # Make called command options available
       opts = self.options
       self.options = (Chef::Knife::TopoBootstrap.options).merge(Chef::Knife::TopoCookbookUpload.options)
       self.options.merge!(opts)
@@ -88,10 +88,10 @@
           topo.save
         end
 
         # make sure env and cookbooks are in place
         check_chef_env(topo['chef_environment']) if topo['chef_environment']
-        upload_cookbooks(@topo_upload_args) if (!config[:no_upload])  
+        upload_cookbooks(@topo_upload_args) if (!config[:disable_upload])  
 
         # update any existing nodes
         topo_hash = topo.raw_data
         nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
         config[:disable_editing] = true