Merge pull request chef#159 from jjasghar/1.1.0

1.1.0 release branch

.travis.yml

@@ -1,6 +1,6 @@
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
   - 2.2.0
 
 script: bundle exec rake spec

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.0
+* Update the travis tests
+* Added Multi-region support
+* Updated the README to represent the changes in installing Chef.
+* Updated travis.yml to reflect newer 2.y.z releases of Ruby
+
+## v1.0.0
 
 * Implementation using knife-cloud gem
 * KNIFE-310 "knife openstack server list" will fail with boot from volume instances

Gemfile

@@ -6,5 +6,4 @@ gemspec
 group :development do
   gem 'guard-rspec'
   gem 'mixlib-shellout'
-  gem 'knife-windows'
 end

knife-openstack.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
-  s.authors     = ["Clogeny"]
-  s.email       = ["[email protected]"]
-  s.homepage    = "https://github.com/opscode/knife-openstack"
-  s.summary     = %q{OpenStack Compute Support for Chef's Knife Command}
-  s.description = %q{OpenStack Compute Support for Chef's Knife Command using knife-cloud gem}
+  s.authors     = ["JJ Asghar"]
+  s.email       = ["[email protected]"]
+  s.homepage    = "https://github.com/chef/knife-openstack"
+  s.summary     = %q{Chef Compute Support for Chef's Knife Command}
+  s.description = %q{Chef Compute Support for Chef's Knife Command using knife-cloud gem}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

lib/chef/knife/cloud/openstack_service.rb

@@ -17,6 +17,7 @@ def initialize(options = {})
           Chef::Log.debug("openstack_tenant #{Chef::Config[:knife][:openstack_tenant]}")
           Chef::Log.debug("openstack_endpoint_type #{Chef::Config[:knife][:openstack_endpoint_type] || 'publicURL' }")
           Chef::Log.debug("openstack_insecure #{Chef::Config[:knife][:openstack_insecure].to_s}")
+          Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region].to_s}")
 
           super(options.merge({
                               :auth_params => {

lib/knife-openstack/version.rb

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

spec/spec_context.rb

@@ -20,13 +20,15 @@
     Chef::Config[:knife][:openstack_username] = "testuser"
     Chef::Config[:knife][:openstack_password] = "testpassword"
     Chef::Config[:knife][:openstack_auth_url] = "tsturl"
+    Chef::Config[:knife][:openstack_region] = "test-region"
     allow(instance).to receive(:exit)
   end
 
   after(:all) do
     Chef::Config[:knife].delete(:openstack_username)
     Chef::Config[:knife].delete(:openstack_password)
     Chef::Config[:knife].delete(:openstack_auth_url)
+    Chef::Config[:knife].delete(:openstack_region)
   end
 
   it "validate openstack mandatory options" do

spec/unit/openstack_server_create_spec.rb

@@ -53,13 +53,15 @@
       Chef::Config[:knife][:identity_file] = "identity_file"
       Chef::Config[:knife][:image_os_type] = "linux"
       Chef::Config[:knife][:openstack_ssh_key_id] = "openstack_ssh_key"
+      Chef::Config[:knife][:openstack_region] = "test-region"
     end
 
     after(:all) do
       Chef::Config[:knife].delete(:bootstrap_protocol)
       Chef::Config[:knife].delete(:identity_file)
       Chef::Config[:knife].delete(:image_os_type)
       Chef::Config[:knife].delete(:openstack_ssh_key_id)
+      Chef::Config[:knife].delete(:openstack_region)
     end
 
     it "run sucessfully on all params exist" do
@@ -104,6 +106,7 @@
       expect(@instance.create_options[:server_def][:flavor_ref]).to be == Chef::Config[:knife][:flavor]
       expect(@instance.create_options[:server_def][:nics]).to be == Chef::Config[:knife][:network_ids]
       expect(@instance.create_options[:server_def][:metadata]).to be == Chef::Config[:knife][:metadata]
+      expect(@instance.create_options[:server_def][:region]).to be == Chef::Config[:knife][:openstack_region]
       expect(@instance.create_options[:server_create_timeout]).to be == Chef::Config[:knife][:server_create_timeout]
     end