From ef1b8ce681e39d2b07b6339a07740c5e8ebbbefc Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 5 Mar 2015 10:30:52 -0600 Subject: [PATCH 1/6] 1.1.0 release branch --- CHANGELOG.md | 6 ++++++ knife-openstack.gemspec | 10 +++++----- lib/knife-openstack/version.rb | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d8cd21e..904f1738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.1.0 +* Update the travis tests +* Added Multi-region support +* Updated the README to represent the changes in installing Chef. + +## v1.0.0 * Implementation using knife-cloud gem * KNIFE-310 "knife openstack server list" will fail with boot from volume instances diff --git a/knife-openstack.gemspec b/knife-openstack.gemspec index 05e6adee..6a1b5e51 100644 --- a/knife-openstack.gemspec +++ b/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 = ["contact@clogeny.com"] - 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 = ["jj@chef.io"] + 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") diff --git a/lib/knife-openstack/version.rb b/lib/knife-openstack/version.rb index 6b643710..3aab2d0c 100644 --- a/lib/knife-openstack/version.rb +++ b/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 From 150bfadda724713945b12602402d1fe9f4782b3c Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 5 Mar 2015 13:02:01 -0600 Subject: [PATCH 2/6] updated Gemfile --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 993d2e34..21eba4ec 100644 --- a/Gemfile +++ b/Gemfile @@ -6,5 +6,6 @@ gemspec group :development do gem 'guard-rspec' gem 'mixlib-shellout' - gem 'knife-windows' + gem 'knife-windows', :git => 'https://github.com/chef/knife-windows.git' + gem 'winrm-s', :git => 'https://github.com/chef/winrm-s.git' end From 939db0f4c58117d1e7139f417f0d91195517d9dc Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 5 Mar 2015 18:45:26 -0600 Subject: [PATCH 3/6] fixed up the multiregion support --- lib/chef/knife/cloud/openstack_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/chef/knife/cloud/openstack_service.rb b/lib/chef/knife/cloud/openstack_service.rb index 744ef788..d48591e1 100644 --- a/lib/chef/knife/cloud/openstack_service.rb +++ b/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 => { From dd4ac17e4e58250f0e7a9d95e1b94db59cdd5734 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 5 Mar 2015 23:59:24 -0600 Subject: [PATCH 4/6] specs specs specs --- spec/spec_context.rb | 2 ++ spec/unit/openstack_server_create_spec.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/spec/spec_context.rb b/spec/spec_context.rb index 0b9b556f..b87e0378 100644 --- a/spec/spec_context.rb +++ b/spec/spec_context.rb @@ -20,6 +20,7 @@ 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 @@ -27,6 +28,7 @@ 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 diff --git a/spec/unit/openstack_server_create_spec.rb b/spec/unit/openstack_server_create_spec.rb index 01e1d982..627ec27b 100644 --- a/spec/unit/openstack_server_create_spec.rb +++ b/spec/unit/openstack_server_create_spec.rb @@ -53,6 +53,7 @@ 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 @@ -60,6 +61,7 @@ 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 From 6fbb392c2e3f4ceed247c707fd5607f3acc94bab Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 6 Mar 2015 00:20:42 -0600 Subject: [PATCH 5/6] updated travis --- .travis.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c59a876f..16e6d977 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ rvm: - 2.0.0 - - 2.1.2 + - 2.1.5 - 2.2.0 script: bundle exec rake spec diff --git a/CHANGELOG.md b/CHANGELOG.md index 904f1738..497a35b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * 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 From 8d23967ff3a61f42223526e62763e2096816edf5 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 6 Mar 2015 12:37:37 -0600 Subject: [PATCH 6/6] removed the knife-windows from development --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 21eba4ec..6d95e95e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,4 @@ gemspec group :development do gem 'guard-rspec' gem 'mixlib-shellout' - gem 'knife-windows', :git => 'https://github.com/chef/knife-windows.git' - gem 'winrm-s', :git => 'https://github.com/chef/winrm-s.git' end