knife-openstack 1.1.0 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea242685d75f01b20a70637b61cf4ab62c709c3
-  data.tar.gz: 43e9ef99f3d74ef0d31c94aa816fc74c34d980f4
+  metadata.gz: a33976b5305864956528c1fedbabe2defc0c4e11
+  data.tar.gz: ba9af32d2611e5a80b0d24cdae159f11298ff79e
 SHA512:
-  metadata.gz: 913697f43e80f4b1f7fa9a2bd0f7076e861cc91a30daacbe415d51f8bb72c02c03b65201274709d991bba36b9a8784dff84050833943caddf27671ba273f27e1
-  data.tar.gz: 983ad39ab270c263102031a1027aa7c8d51f8a0246ae4683aa9df06c70f20519399aec1c30aad535e0df731b1e8f80f40cee5078cf7d2e5934499197fcb4aa92
+  metadata.gz: eda31037c9f771f7cb86cdacafcefc6c180e873f1338ea6e872b6c4cb2fafb4831a008790ef02b219703afcc287aea13bccf7687d1904408f608d41b9e4b2418
+  data.tar.gz: f8ffbe6ad7b916d5e296e82ff5cf26971b848a6f9233e547f13afce68cf69bbae7ca1d21ae84125807d9caa8ae884768c89d8968ad85853bd15bbe676f960bd1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.2.0
+* Allow users to specify alternate private networks. #163
+* Vol sched 1.0.0work #142
+
 ## v1.1.0
 * Update the travis tests
 * Added Multi-region support

data/README.md

@@ -3,7 +3,7 @@
 Knife OpenStack
 ===============
 
-This is the official Chef Knife plugin for OpenStack Compute (Nova). This plugin gives knife the ability to create, bootstrap and manage instances in OpenStack Compute clouds. It has been tested against the `Diablo` through `Juno` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
+This is the official Chef Knife plugin for OpenStack Compute (Nova). This plugin gives knife the ability to create, bootstrap and manage instances in OpenStack Compute clouds. It has been tested against the `Diablo` through `Kilo` releases in configurations using Keystone against the OpenStack API (as opposed to the EC2 API).
 
 Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issues.
 
@@ -11,12 +11,12 @@ Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issu
 
 Be sure you are running the latest version Chef. Versions earlier than 0.10.0 don't support plugins:
 
-    $ curl -L https://chef.io/chef/install.sh > /tmp/install.sh && sudo bash /tmp/install.sh
+    $ curl -L https://chef.io/chef/install.sh | sudo bash
   
 This plugin is distributed as a Ruby Gem. To install it, run:
 
     $ chef gem install knife-openstack
-    $ # OR
+    OR
     $ gem install knife-openstack
     
 Depending on your system's configuration, you may need to run this command with root privileges.
@@ -38,7 +38,7 @@ If your knife.rb file will be checked into a SCM system (ie readable by others)
     knife[:openstack_username] = "#{ENV['OS_USERNAME']}"
     knife[:openstack_password] = "#{ENV['OS_PASSWORD']}"
     knife[:openstack_tenant] = "#{ENV['OS_TENANT_NAME']}"
-    knife[:openstack_region] = "#{ENV['OS_region_NAME']}"
+    knife[:openstack_region] = "#{ENV['OS_REGION_NAME']}"
 
 If your OpenStack deployment is over SSL, but does not have a valid certificate, you can add the following option to bypass SSL check:
 
@@ -84,7 +84,7 @@ This plugin provides the following Knife subcommands. Specific command options c
 knife openstack server create
 -----------------------------
 
-Provisions a new server in an OpenStack Compute cloud and then perform a Chef bootstrap (using the SSH protocol). The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server. By default the server is bootstrapped using the [chef-full](https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/chef-full.erb) template (default since the 10.10 release). This may be overridden using the `-d` or `--template-file` command options. If you do not have public IP addresses, use the `--private-network` option to use the private IP address for bootstrapping or `--bootstrap-network NAME` to specify an alternate network. Please see `knife openstack server create --help` for all of the supported options.
+Provisions a new server in an OpenStack Compute cloud and then perform a Chef bootstrap (using the SSH protocol). The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server. By default the server is bootstrapped using the [chef-full](https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/chef-full.erb) template (default since the 10.10 release). This may be overridden using the `-d` or `--template-file` command options. If you do not have public IP addresses, use the `--openstack-private-network` option to use the private IP address for bootstrapping.  In addition, you can use the `--bootstrap-network NAME` option to specify an alternate network for either a private or public network. If a network name isn't specified, the default name will be `'public'` for a public network and `'private'` for a private network e.g. when the `--openstack-private-network` option is specified.  Please see `knife openstack server create --help` for all of the supported options.
 
 knife openstack server delete
 -----------------------------
@@ -101,6 +101,11 @@ knife openstack flavor list
 
 Provides a list of all available flavors (available "hardware" configurations for a server) available to the currently configured OpenStack account. Each flavor has a unique combination of virtual cpus, disk space and memory capacity. This data may be useful when choosing a flavor to pass to the `knife openstack server create` subcommand.
 
+knife openstack volume list
+---------------------------
+
+Provides a list of all volumes in the currently configured OpenStack account. Each volume shows its size and its availibility to be attached to server. This data may be useful when choosing a volume to pass to the `knife openstack server create` subcommand.
+
 knife openstack image list
 --------------------------
 
@@ -124,6 +129,8 @@ Author:: Matt Ray (<matt@chef.io>)
 
 Author:: Chirag Jog (<chirag@clogeny.com>)
 
+Author:: JJ Asghar (<jj@chef.io>)
+
 Copyright:: Copyright (c) 2011-2015 Chef Software, Inc.
 
 License:: Apache License, Version 2.0

data/lib/chef/knife/cloud/openstack_server_create_options.rb

@@ -22,6 +22,16 @@ class Chef
             :default => "-1",
             :description => "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional."
 
+            option :openstack_volumes,
+            :long => "--openstack-volumes VOLUME1,VOLUME2,VOLUME3",
+            :description => "Comma separated list of the UUID(s) of the volume(s) to attach to the server",
+            :proc => Proc.new { |volumes| volumes.split(',') }
+
+            option :openstack_scheduler_hints,
+            :long => "--scheduler-hints HINTS",
+            :description => "A scheduler group hint to OpenStack",
+            :proc => Proc.new { |i| Chef::Config[:knife][:openstack_scheduler_hints] = i }
+
             option :openstack_security_groups,
             :short => "-G X,Y,Z",
             :long => "--openstack-groups X,Y,Z",
@@ -34,7 +44,7 @@ class Chef
             :long => "--openstack-ssh-key-id KEY",
             :description => "The OpenStack SSH keypair id",
             :proc => Proc.new { |key| Chef::Config[:knife][:openstack_ssh_key_id] = key }
-            
+
             option :user_data,
             :long => "--user-data USER_DATA",
             :description => "The file path containing user data information for this server",

data/lib/chef/knife/openstack_server_create.rb

@@ -47,11 +47,24 @@ class Chef
                 :flavor_ref => service.get_flavor(locate_config_value(:flavor)).id,
                 :security_groups => locate_config_value(:openstack_security_groups),
                 :availability_zone => locate_config_value(:availability_zone),
+                "os:scheduler_hints" => locate_config_value(:openstack_scheduler_hints),
                 :metadata => locate_config_value(:metadata),
                 :key_name => locate_config_value(:openstack_ssh_key_id)
               },
               :server_create_timeout => locate_config_value(:server_create_timeout)
             }
+            unless locate_config_value(:openstack_volumes).nil?
+              counter = 99
+              @create_options[:server_def][:block_device_mapping] = locate_config_value(:openstack_volumes).map do |vol|
+                counter += 1 
+                {
+                  :volume_id => vol,
+                  :delete_on_termination => false,
+                  :device_name => "/dev/vd"+counter.chr,
+                  :volume_size => nil,
+                }
+                end
+            end
 
             @create_options[:server_def].merge!({:user_data => locate_config_value(:user_data)}) if locate_config_value(:user_data)
             @create_options[:server_def].merge!({:nics => locate_config_value(:network_ids).map { |nic| nic_id = { 'net_id' => nic }}}) if locate_config_value(:network_ids)
@@ -129,8 +142,10 @@ class Chef
           # Use SSH password either specified from command line or from openstack server instance
           config[:ssh_password] = locate_config_value(:ssh_password) || server.password unless config[:openstack_ssh_key_id]
 
-          # private_network means bootstrap_network = 'private'
-          config[:bootstrap_network] = 'private' if config[:private_network]
+          # The bootstrap network is always initialised to 'public' when a network name isn't specified.  Therefore,
+          # only set the bootstrap network to 'private' if still initialised to public and nothing was specified for
+          # the private network name.
+          config[:bootstrap_network] = 'private' if (config[:private_network] && config[:bootstrap_network] == 'public')
 
           # Which IP address to bootstrap
           unless config[:network] # --no-network

data/lib/chef/knife/openstack_volume_list.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Seth Chisamore (<schisamo@getchef.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
+# Author:: Evan Felix (<karcaw@gmail.com>)
+# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/cloud/list_resource_command'
+require 'chef/knife/openstack_helpers'
+require 'chef/knife/cloud/openstack_service_options'
+
+class Chef
+  class Knife
+    class Cloud
+      class OpenstackVolumeList < ResourceListCommand
+          include OpenstackHelpers
+          include OpenstackServiceOptions
+
+        banner "knife openstack volume list (options)"
+
+        def query_resource
+          begin
+            @service.connection.volumes
+          rescue Excon::Errors::BadRequest => e
+            response = Chef::JSONCompat.from_json(e.response.body)
+            ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+            raise e
+          end
+        end
+
+        def list(volumes)
+          volume_list = [
+            ui.color('Name', :bold),
+            ui.color('ID', :bold),
+            ui.color('Status', :bold),
+            ui.color('Size', :bold),
+            ui.color('Description', :bold),
+          ]
+          begin
+            volumes.sort_by(&:name).each do |volume|
+              volume_list << volume.name
+              volume_list << volume.id.to_s
+              volume_list << volume.status
+              volume_list << "#{volume.size.to_s} GB"
+              volume_list << volume.description
+            end
+          rescue Excon::Errors::BadRequest => e
+            response = Chef::JSONCompat.from_json(e.response.body)
+            ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+            raise e
+          end
+          puts ui.list(volume_list, :uneven_columns_across, 5)
+        end
+      end
+    end
+  end
+end

data/lib/knife-openstack/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module OpenStack
-    VERSION = "1.1.0"
+    VERSION = "1.2.0.rc1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/functional/volume_list_func_spec.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
+# Author:: Ameya Varade (<ameya.varade@clogeny.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+require 'chef/knife/openstack_volume_list'
+require 'chef/knife/cloud/openstack_service'
+require 'support/shared_examples_for_command'
+
+describe Chef::Knife::Cloud::OpenstackVolumeList do
+  let (:instance) {Chef::Knife::Cloud::OpenstackVolumeList.new}
+
+  context "functionality" do
+    before do
+      resources = [ TestResource.new({:id => "volume-1", :name => "big-disk-volume", :status => "available", :size => 1024, :description => "This is the big disk"}),
+                     TestResource.new({:id => "volume-2", :name => "little-disk-volume", :status => "in-use", :size => 8, :description => "This is the little disk"})
+                   ]
+      allow(instance).to receive(:query_resource).and_return(resources)
+      allow(instance).to receive(:puts)
+      allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
+      allow(instance).to receive(:validate!)
+    end
+
+    it "lists formatted list of resources" do
+      expect(instance.ui).to receive(:list).with(["Name", "ID", "Status", "Size", "Description",
+                                              "big-disk-volume", "volume-1", "available", "1024 GB", "This is the big disk",
+                                              "little-disk-volume", "volume-2", "in-use", "8 GB", "This is the little disk"], :uneven_columns_across, 5)
+      instance.run
+    end
+  end
+end

data/spec/unit/openstack_server_create_spec.rb

@@ -300,6 +300,21 @@ describe Chef::Knife::Cloud::OpenstackServerCreate do
       @instance.before_bootstrap
       expect(@instance.config[:ssh_password]).to be == server_password
     end
+
+    it "configures the default private bootstrap network to use 'private'" do
+      allow(@instance.server).to receive(:addresses).and_return({"private"=>[{"version"=>4, "addr"=>"127.0.0.1"}]})
+      @instance.config[:private_network] = true
+      @instance.before_bootstrap
+      expect(@instance.config[:bootstrap_network]).to be == 'private'
+    end
+
+    it "configures the bootstrap to use alternate private network" do
+      allow(@instance.server).to receive(:addresses).and_return({"secure"=>[{"version"=>4, "addr"=>"127.0.0.1"}]})
+      @instance.config[:bootstrap_network] = 'secure'
+      @instance.config[:private_network] = true
+      @instance.before_bootstrap
+      expect(@instance.config[:bootstrap_network]).to be == 'secure'
+    end
   end
 
   describe "#post_connection_validations" do

data/spec/unit/openstack_volume_list_spec.rb

@@ -0,0 +1,29 @@
+#
+# Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
+# Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
+# Author:: Ameya Varade (<ameya.varade@clogeny.com>)
+# Copyright:: Copyright (c) 2013-2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+require 'chef/knife/openstack_volume_list'
+require 'chef/knife/cloud/openstack_service'
+require 'support/shared_examples_for_command'
+
+describe Chef::Knife::Cloud::OpenstackVolumeList do
+  it_behaves_like Chef::Knife::Cloud::Command, Chef::Knife::Cloud::OpenstackVolumeList.new
+
+  include_context "#validate!", Chef::Knife::Cloud::OpenstackVolumeList.new
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-openstack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -151,6 +151,7 @@ files:
 - lib/chef/knife/openstack_server_delete.rb
 - lib/chef/knife/openstack_server_list.rb
 - lib/chef/knife/openstack_server_show.rb
+- lib/chef/knife/openstack_volume_list.rb
 - lib/knife-openstack/version.rb
 - spec/functional/flavor_list_func_spec.rb
 - spec/functional/group_list_func_spec.rb
@@ -160,6 +161,7 @@ files:
 - spec/functional/server_delete_func_spec.rb
 - spec/functional/server_list_func_spec.rb
 - spec/functional/server_show_func_spec.rb
+- spec/functional/volume_list_func_spec.rb
 - spec/integration/cleanup.rb
 - spec/integration/config/environment.yml.sample
 - spec/integration/config/incorrect_openstack.pem
@@ -175,6 +177,7 @@ files:
 - spec/unit/openstack_server_list_spec.rb
 - spec/unit/openstack_server_show_spec.rb
 - spec/unit/openstack_service_spec.rb
+- spec/unit/openstack_volume_list_spec.rb
 homepage: https://github.com/chef/knife-openstack
 licenses: []
 metadata: {}
@@ -189,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -207,6 +210,7 @@ test_files:
 - spec/functional/server_delete_func_spec.rb
 - spec/functional/server_list_func_spec.rb
 - spec/functional/server_show_func_spec.rb
+- spec/functional/volume_list_func_spec.rb
 - spec/integration/cleanup.rb
 - spec/integration/config/environment.yml.sample
 - spec/integration/config/incorrect_openstack.pem
@@ -222,4 +226,4 @@ test_files:
 - spec/unit/openstack_server_list_spec.rb
 - spec/unit/openstack_server_show_spec.rb
 - spec/unit/openstack_service_spec.rb
-has_rdoc: true
+- spec/unit/openstack_volume_list_spec.rb