knife-profitbricks 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a05c9b51197a5c4bede8622f3170ba90a999376
-  data.tar.gz: ec8e94f0990da74450a155326d848ffa42ffe886
+  metadata.gz: 4728fcd8307f5d8d3c99c35359510c6375ecbf17
+  data.tar.gz: ea5d5c7fbffa535126c1bd9ef6a27fcf1899c56e
 SHA512:
-  metadata.gz: b8aa428d7098cfa7c17fef338deea8d47823815d57c345dd4f6cacbe64a5e3514438085b838ba82e7356d9d8f253d2e6a45a2e5a80c68981badea293d25c5683
-  data.tar.gz: 658bb33cb572b73aeb46a8ba192b4eb23e93ad36368c0751d8e816ab3ca16c0ae1e575a8605b4c67d708915ead3ece4e88703d9ad4c9bacabac671a02f8d3ad4
+  metadata.gz: b621da0104fe0428693403e77842a27e22239cd5452c4028d9fc64137c7e73343e62a4af36e219aec6a2439fa01f2fac93cfee375ac212fad4b84966fbd9533c
+  data.tar.gz: 1ca58101f3b618e6b1689dbe5f8325c35b905595283830be32820194fcb73edd4597ec8ac59526b9e215c42595b2afb8780845dc678cf87f307f3b3c195d0860

data/knife-profitbricks.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "profitbricks-sdk-ruby", "~> 1.1"
+  spec.add_runtime_dependency "profitbricks-sdk-ruby", "~> 3.0"
   spec.add_runtime_dependency "chef", "~> 12"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/chef/knife/profitbricks_composite_server_create.rb

@@ -80,6 +80,12 @@ class Chef
              long: '--image-password PASSWORD',
              description: 'The password set on the image for the "root" or "Administrator" user'
 
+      option :volume_availability_zone,
+             short: '-Z AVAILABILITY_ZONE',
+             long: '--volume-availability-zone AVAILABILITY_ZONE',
+             description: 'The volume availability zone of the server',
+             required: false
+
       option :sshkeys,
              short: '-K SSHKEY[,SSHKEY,...]',
              long: '--ssh-keys SSHKEY1,SSHKEY2,...',
@@ -109,6 +115,11 @@ class Chef
              description: 'The LAN ID the NIC will reside on; if the LAN ID does not exist it will be created',
              required: true
 
+      option :nat,
+             long: '--nat',
+             description: 'Set to enable NAT on the NIC',
+             required: false
+
       def run
         $stdout.sync = true
 
@@ -130,6 +141,10 @@ class Chef
           volume_params[:imagePassword] = config[:imagepassword]
         end
 
+        if config[:volume_availability_zone]
+          volume_params[:availabilityZone] = config[:volume_availability_zone]
+        end
+
         nic_params = {
           name: config[:nicname],
           ips: config[:ips],
@@ -137,6 +152,10 @@ class Chef
           lan: config[:lan]
         }
 
+        if config[:nat]
+          nic_params[:nat] = config[:nat]
+        end
+
         params = {
           name: config[:name],
           cores: config[:cores],

data/lib/chef/knife/profitbricks_nic_create.rb

@@ -44,6 +44,12 @@ class Chef
              description: 'The LAN ID the NIC will reside on; if the LAN ID does not exist it will be created',
              required: true
 
+      option :nat,
+             long: '--nat',
+             boolean: true | false,
+             description: 'Set to enable NAT on the NIC',
+             required: false
+
       def run
         $stdout.sync = true
 
@@ -56,6 +62,10 @@ class Chef
           lan: config[:lan]
         }
 
+        if config[:nat]
+          params[:nat] = config[:nat]
+        end
+
         connection
         nic = ProfitBricks::NIC.create(
           config[:datacenter_id],
@@ -73,6 +83,7 @@ class Chef
         puts "#{ui.color('IPs', :cyan)}: #{nic.properties['ips']}"
         puts "#{ui.color('DHCP', :cyan)}: #{nic.properties['dhcp']}"
         puts "#{ui.color('LAN', :cyan)}: #{nic.properties['lan']}"
+        puts "#{ui.color('NAT', :cyan)}: #{nic.properties['nat']}"
 
         puts 'done'
       end

data/lib/chef/knife/profitbricks_nic_list.rb

@@ -27,6 +27,7 @@ class Chef
           ui.color('Name', :bold),
           ui.color('IPs', :bold),
           ui.color('DHCP', :bold),
+          ui.color('NAT', :bold),
           ui.color('LAN', :bold)
         ]
         connection
@@ -36,10 +37,11 @@ class Chef
           nic_list << nic.properties['name']
           nic_list << nic.properties['ips'].to_s
           nic_list << nic.properties['dhcp'].to_s
+          nic_list << nic.properties['nat'].to_s
           nic_list << nic.properties['lan'].to_s
         end
 
-        puts ui.list(nic_list, :uneven_columns_across, 5)
+        puts ui.list(nic_list, :uneven_columns_across, 6)
       end
     end
   end

data/lib/chef/knife/profitbricks_volume_create.rb

@@ -57,6 +57,12 @@ class Chef
              description: 'A list of public SSH keys to include',
              proc: proc { |sshkeys| sshkeys.split(',') }
 
+      option :volume_availability_zone,
+             short: '-Z AVAILABILITY_ZONE',
+             long: '--availability-zone AVAILABILITY_ZONE',
+             description: 'The volume availability zone of the server',
+             required: false
+
       def run
         $stdout.sync = true
 
@@ -79,6 +85,10 @@ class Chef
           params[:imagePassword] = config[:imagepassword]
         end
 
+        if config[:volume_availability_zone]
+          params[:availabilityZone] = config[:volume_availability_zone]
+        end
+
         connection
         volume = ProfitBricks::Volume.create(
           config[:datacenter_id],
@@ -97,6 +107,7 @@ class Chef
         puts "#{ui.color('Image', :cyan)}: #{volume.properties['image']}"
         puts "#{ui.color('Type', :cyan)}: #{volume.properties['type']}"
         puts "#{ui.color('Licence Type', :cyan)}: #{volume.properties['licenceType']}"
+        puts "#{ui.color('Zone', :cyan)}: #{volume.properties['availabilityZone']}"
         puts 'done'
       end
     end

data/lib/chef/knife/profitbricks_volume_list.rb

@@ -18,7 +18,7 @@ class Chef
              short: '-S SERVER_ID',
              long: '--server-id SERVER_ID',
              description: 'The ID of the server',
-             required: true
+             required: false
 
       def run
         $stdout.sync = true
@@ -29,6 +29,7 @@ class Chef
           ui.color('Bus', :bold),
           ui.color('Image', :bold),
           ui.color('Type', :bold),
+          ui.color('Zone', :bold),
           ui.color('Device Number', :bold)
         ]
 
@@ -42,6 +43,7 @@ class Chef
             volume_list << volume.properties['bus']
             volume_list << volume.properties['image']
             volume_list << volume.properties['type']
+            volume_list << volume.properties['availabilityZone']
             volume_list << volume.properties['deviceNumber'].to_s
           end 
         else
@@ -52,11 +54,12 @@ class Chef
             volume_list << volume.properties['bus']
             volume_list << volume.properties['image']
             volume_list << volume.properties['type']
+            volume_list << volume.properties['availabilityZone']
             volume_list << volume.properties['deviceNumber'].to_s
           end
         end
 
-        puts ui.list(volume_list, :uneven_columns_across, 7)
+        puts ui.list(volume_list, :uneven_columns_across, 8)
       end
     end
   end

data/lib/knife-profitbricks/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module ProfitBricks
-    VERSION = '1.1.2'
+    VERSION = '1.2.0'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-profitbricks
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ethan Devenport
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: profitbricks-sdk-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement