knife-maas 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6991e39923bff3d624a37ee31c917eea2f850f
-  data.tar.gz: 31e0526c31401c12c5d0a60a61ea081c6564e37e
+  metadata.gz: 2827197e487f6127acddd0368ac0f40de6a0b765
+  data.tar.gz: 61d537f16f95d92077e8ee3021674a0caae9a739
 SHA512:
-  metadata.gz: 0adc4dc1a6dba84643b097e5808de87735c08d68804135b8a1f3de251ddd8dc70793d8bf737a3ec1ee6793ba0a0812754eaf22a013254a03adfdf18d4c1f7fc0
-  data.tar.gz: f6662e9dbad65642d1fb6bf3e53ed9a3be125b9e886eb6bd8f8c324d9aefab3f7258916a9f01cfd252c82e1bc1767abfb1f9b66fd7bf88d98b89ebe82137a7e1
+  metadata.gz: 486afb9e8efbd59bf9a139250daa3d3dcb314181702503823b38266b9e8a76cc2b02a8b15ea78e5ec768a8dd589ab163c92da50657a124158c677ce0dc76b156
+  data.tar.gz: 73c5a70afdb4b76463177215ec4a63a2fe45a9c599cc1cf38059553094c84c733081c079b638983b108ebc9dfad422b7de5a9aaafb3837e77ed4bec64211d0b8

data/lib/chef/knife/maas/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Knife
     module Maas
-      VERSION = "1.1.5"
+      VERSION = "1.2.0"
     end
   end
 end

data/lib/chef/knife/maas_server_acquire.rb

@@ -11,8 +11,32 @@ class Chef
 
       banner "knife maas server acquire (options)"
 
+      option :hostname,
+      :short => "-h HOSTNAME",
+      :long => "--hostname HOSTNAME",
+      :description => "The HOSTNAME inside of MAAS"
+
+      option :zone,
+      :short => "-Z ZONE",
+      :long => "--zone ZONE",
+      :description => "Bootstrap inside a ZONE inside of MAAS"
+
       def run
-        response = access_token.request(:post, "/nodes/?op=acquire")
+
+        hostname = locate_config_value(:hostname)
+        zone = locate_config_value(:zone)
+
+        if (!hostname.nil? && !zone.nil?)
+          puts "\nPlease only use one of these options, zone or hostname"
+          exit 1
+        elsif !hostname.nil?
+          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','name' => "#{hostname}"})
+        elsif !zone.nil?
+          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','zone' => "#{zone}"})
+        else
+          response = access_token.request(:post, "/nodes/?op=acquire")
+        end
+
         hostname = JSON.parse(response.body)["hostname"]
         puts "Acquiring #{hostname} under your account now...."
       end

data/lib/chef/knife/maas_server_bootstrap.rb

@@ -13,6 +13,11 @@ class Chef
 
       banner "knife maas server bootstrap (options)"
 
+      option :hostname,
+      :short => "-h HOSTNAME",
+      :long => "--hostname HOSTNAME",
+      :description => "The HOSTNAME inside of MAAS"
+
       option :template_file,
       :long => "--template-file TEMPLATE",
       :description => "Full path to location of template to use",
@@ -26,9 +31,27 @@ class Chef
       :proc => lambda { |o| o.split(/[\s,]+/) },
       :default => []
 
+      option :zone,
+      :short => "-Z ZONE",
+      :long => "--zone ZONE",
+      :description => "Bootstrap inside a ZONE inside of MAAS"
+
       def run
 
-        response = access_token.request(:post, "/nodes/?op=acquire")
+        hostname = locate_config_value(:hostname)
+        zone = locate_config_value(:zone)
+
+        if (!hostname.nil? && !zone.nil?)
+          puts "\nPlease only use one of these options, zone or hostname"
+          exit 1
+        elsif !hostname.nil?
+          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','name' => "#{hostname}"})
+        elsif !zone.nil?
+          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','zone' => "#{zone}"})
+        else
+          response = access_token.request(:post, "/nodes/?op=acquire")
+        end
+
         hostname = JSON.parse(response.body)["hostname"]
         system_id = JSON.parse(response.body)["system_id"]
         system_info = access_token.request(:get, "/nodes/#{system_id}/")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-maas
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef