From b08af59f34c49daf20ee6a668a6eb5ef22851da7 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Tue, 18 Dec 2012 14:01:47 +0000 Subject: [PATCH 01/12] site.pp overrides sql_connection for glance-api.conf also Previously, the sql_connection config was overridden for the glance-registry.conf only, whereas in the glance-api.conf this is left to default to a non-existent sqlite DB. This causes an issue with the v2 API is used - in this case, the glance-api service accesses the DB directly instead of delegating to the registry service. Since the sqlite DB is non-existent, such v2 API calls fail with 500 ServerError. This is especially problematic with cinder, as it tries the glance v2 API by default when creating a bootable volume from an image, see: https://bugzilla.redhat.com/888241 --- examples/site.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/site.pp b/examples/site.pp index 1f2fda9f..acb67825 100644 --- a/examples/site.pp +++ b/examples/site.pp @@ -37,6 +37,7 @@ class role_glance_mysql { keystone_tenant => 'services', keystone_user => 'glance', keystone_password => 'glance_password', + sql_connection => 'mysql://glance:glance@127.0.0.1/glance', } class { 'glance::backend::file': } From 51dc02d14580747b360bfdba2e3f8f9219134ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= Date: Tue, 18 Dec 2012 16:57:27 +0100 Subject: [PATCH 02/12] Glance's Keystone endpoint does not need the '/v1' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As said in [1], “This is useless and causes problem with library using glanceclient. Glance has already a workaround for this […]” [1] https://review.openstack.org/#/c/18325/ --- manifests/keystone/auth.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index bf804eeb..9eb31e29 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -50,9 +50,9 @@ class glance::keystone::auth( if $configure_endpoint { keystone_endpoint { "${region}/$auth_name": ensure => present, - public_url => "${public_protocol}://${public_address}:${port}/v1", - admin_url => "http://${admin_address}:${port}/v1", - internal_url => "http://${internal_address}:${port}/v1", + public_url => "${public_protocol}://${public_address}:${port}", + admin_url => "http://${admin_address}:${port}", + internal_url => "http://${internal_address}:${port}", } } } From ab7f830524fdbc2d00e697a1b5c54ee7edf0a688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= Date: Tue, 18 Dec 2012 17:25:05 +0100 Subject: [PATCH 03/12] And don't forget to update the tests ! --- spec/classes/glance_keystone_auth_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/classes/glance_keystone_auth_spec.rb b/spec/classes/glance_keystone_auth_spec.rb index b5735a7a..14cd957a 100644 --- a/spec/classes/glance_keystone_auth_spec.rb +++ b/spec/classes/glance_keystone_auth_spec.rb @@ -26,9 +26,9 @@ describe 'glance::keystone::auth' do it { should contain_keystone_endpoint('RegionOne/glance').with( :ensure => 'present', - :public_url => 'http://127.0.0.1:9292/v1', - :admin_url => 'http://127.0.0.1:9292/v1', - :internal_url => 'http://127.0.0.1:9292/v1' + :public_url => 'http://127.0.0.1:9292', + :admin_url => 'http://127.0.0.1:9292', + :internal_url => 'http://127.0.0.1:9292' )} end @@ -76,9 +76,9 @@ describe 'glance::keystone::auth' do it { should contain_keystone_endpoint('RegionTwo/glance').with( :ensure => 'present', - :public_url => 'http://10.0.0.1:9393/v1', - :admin_url => 'http://10.0.0.2:9393/v1', - :internal_url => 'http://10.0.0.3:9393/v1' + :public_url => 'http://10.0.0.1:9393', + :admin_url => 'http://10.0.0.2:9393', + :internal_url => 'http://10.0.0.3:9393' )} end From f0aa282c39d5bbbb9c6071c26afb28e96aac4bdb Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 2 Jan 2013 11:42:25 -0800 Subject: [PATCH 04/12] reformat readme change the name for consistency. fix code block formatting. --- README.markdown | 80 ----------------------------------------------- README.md | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 80 deletions(-) delete mode 100644 README.markdown create mode 100644 README.md diff --git a/README.markdown b/README.markdown deleted file mode 100644 index dc4636c7..00000000 --- a/README.markdown +++ /dev/null @@ -1,80 +0,0 @@ -# PuppetLabs Glance module - -This module provides a set of manifests that can be used to install and -configure glance. - -It is currently targettting the folsom release of OpenStack. - -Use the essex branch for essex support. - -## Platforms - -* Ubuntu 11.04 (Natty) -* Ubuntu 11.10 (Oneiric) -* Ubuntu 12.04 (Precise) - -## configurations - -Glance is configured with the following classes: - - - #configures glance::api service - - class { 'glance::api': - verbose => $verbose, - debug => $verbose, - auth_type => 'keystone', - auth_port => '35357', - auth_host => $keystone_host, - keystone_tenant => 'services', - keystone_user => 'glance', - keystone_password => $glance_user_password, - sql_connection => $sql_connection, - enabled => $enabled, - } - - # configures the glance registry - - class { 'glance::registry': - verbose => $verbose, - debug => $verbose, - auth_host => $keystone_host, - auth_port => '35357', - auth_type => 'keystone', - keystone_tenant => 'services', - keystone_user => 'glance', - keystone_password => $glance_user_password, - sql_connection => $sql_connection, - enabled => $enabled, - } - - # Configure file storage backend - - class { 'glance::backend::file': } - - # Create the Glance db, this should be configured on your mysql server - class { 'glance::db::mysql': - user => $glance_db_user, - password => $glance_db_password, - dbname => $glance_db_dbname, - allowed_hosts => $allowed_hosts, - } - - # configures glance endpoints in keystone - # should be run on your keystone server - class { 'glance::keystone::auth': - password => $glance_user_password, - public_address => $glance_public_real, - admin_address => $glance_admin_real, - internal_address => $glance_internal_real, - region => $region, - } - -for full examples, see the examples directory. - -in the module, puppetlabs-openstack, the following classes -configure parts of glance: - - - openstack::glance # api, file backend, and registry - - openstack::keystone # sets up endpoints - - openstack::db::mysql # sets up db config diff --git a/README.md b/README.md new file mode 100644 index 00000000..67724765 --- /dev/null +++ b/README.md @@ -0,0 +1,82 @@ +# PuppetLabs Glance module + +This module provides a set of manifests that can be used to install and +configure glance. + +It is currently targettting the folsom release of OpenStack. + +Use the essex branch for essex support. + +## Platforms + +* Ubuntu 11.04 (Natty) +* Ubuntu 11.10 (Oneiric) +* Ubuntu 12.04 (Precise) + +## configurations + +Glance is configured with the following classes: + + +### configures glance::api service + + class { 'glance::api': + verbose => $verbose, + debug => $verbose, + auth_type => 'keystone', + auth_port => '35357', + auth_host => $keystone_host, + keystone_tenant => 'services', + keystone_user => 'glance', + keystone_password => $glance_user_password, + sql_connection => $sql_connection, + enabled => $enabled, + } + +### configures the glance registry + + class { 'glance::registry': + verbose => $verbose, + debug => $verbose, + auth_host => $keystone_host, + auth_port => '35357', + auth_type => 'keystone', + keystone_tenant => 'services', + keystone_user => 'glance', + keystone_password => $glance_user_password, + sql_connection => $sql_connection, + enabled => $enabled, + } + +### Configure file storage backend + + class { 'glance::backend::file': } + +### Create the Glance db, this should be configured on your mysql server + + class { 'glance::db::mysql': + user => $glance_db_user, + password => $glance_db_password, + dbname => $glance_db_dbname, + allowed_hosts => $allowed_hosts, + } + +### configures glance endpoints in keystone +should be run on your keystone server + + class { 'glance::keystone::auth': + password => $glance_user_password, + public_address => $glance_public_real, + admin_address => $glance_admin_real, + internal_address => $glance_internal_real, + region => $region, + } + +for full examples, see the examples directory. + +in the module, puppetlabs-openstack, the following classes +configure parts of glance: + + - openstack::glance # api, file backend, and registry + - openstack::keystone # sets up endpoints + - openstack::db::mysql # sets up db config From e267f684474fa7cb1cd5496cd451707e3ae63b09 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 2 Jan 2013 11:44:56 -0800 Subject: [PATCH 05/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 67724765..b1963d61 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ It is currently targettting the folsom release of OpenStack. Use the essex branch for essex support. +[![Unit Test Status](https://secure.travis-ci.org/puppetlabs/puppetlabs-glance.png?branch=master)](http://travis-ci.org/puppetlabs/puppetlabs-glance) + ## Platforms * Ubuntu 11.04 (Natty) From 3edac516cec6bd4fa1554bfb25a9381157a6bfdc Mon Sep 17 00:00:00 2001 From: William Van Hevelingen Date: Sat, 9 Feb 2013 02:28:49 -0800 Subject: [PATCH 06/12] Add ruby19 and puppet3 to travis matrix --- .gemfile | 5 ----- .travis.yml | 31 +++++++++++++++++++------------ Gemfile | 13 +++++++++++++ 3 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 .gemfile create mode 100644 Gemfile diff --git a/.gemfile b/.gemfile deleted file mode 100644 index 9aad840c..00000000 --- a/.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source :rubygems - -puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7'] -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 0.1.0' diff --git a/.travis.yml b/.travis.yml index b4513678..dd3394d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,25 @@ language: ruby +bundler_args: --without development +script: "bundle exec rake spec SPEC_OPTS='--format documentation'" rvm: - 1.8.7 -before_script: -after_script: -script: "rake spec" -branches: - only: - - master - - folsom - - essex + - 1.9.3 + - ruby-head env: - - PUPPET_VERSION=2.7.13 - - PUPPET_VERSION=2.7.6 - - PUPPET_VERSION=2.6.9 + - PUPPET_GEM_VERSION="~> 2.6" + - PUPPET_GEM_VERSION="~> 2.7" + - PUPPET_GEM_VERSION="~> 3.0" +matrix: + allow_failures: + - rvm: ruby-head + exclude: + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.7" + - rvm: ruby-head + env: PUPPET_GEM_VERSION="~> 2.7" + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 2.6" + - rvm: ruby-head + env: PUPPET_GEM_VERSION="~> 2.6" notifications: email: false -gemfile: .gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..8e5e04d7 --- /dev/null +++ b/Gemfile @@ -0,0 +1,13 @@ +source :rubygems + +group :development, :test do + gem 'puppetlabs_spec_helper', :require => false +end + +if puppetversion = ENV['PUPPET_GEM_VERSION'] + gem 'puppet', puppetversion, :require => false +else + gem 'puppet', :require => false +end + +# vim:ft=ruby From cc86b4592d52613e040986a4605fd090be050e60 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Fri, 15 Feb 2013 16:02:04 -0800 Subject: [PATCH 07/12] do not add quotes to image name previously, quotes were being added to the image name. this caused the type to not be idempotent. --- lib/puppet/provider/glance_image/glance.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/glance_image/glance.rb b/lib/puppet/provider/glance_image/glance.rb index edef3bd2..aae79ffb 100644 --- a/lib/puppet/provider/glance_image/glance.rb +++ b/lib/puppet/provider/glance_image/glance.rb @@ -50,9 +50,9 @@ Puppet::Type.type(:glance_image).provide( raise(Puppet::Error, "Must specify either source or location") end if stdin - auth_glance_stdin('add', "name='#{resource[:name]}'", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) + auth_glance_stdin('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) else - auth_glance('add', "name='#{resource[:name]}'", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) + auth_glance('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) end end From 9a766567742a1f8e92f033fdeffd449c58cb11e6 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 20 Feb 2013 14:16:03 -0800 Subject: [PATCH 08/12] refactor of glance_image This commit introduces a refactor of glance_image. ensure that it follows the best practices for provider development. - use property hash - use mk_resource_methods - update property hash on create and delete. ensure that it keeps it property hash reasobly up to date. --- lib/puppet/provider/glance_image/glance.rb | 99 ++++++++++------------ 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/lib/puppet/provider/glance_image/glance.rb b/lib/puppet/provider/glance_image/glance.rb index aae79ffb..f5b6ddfb 100644 --- a/lib/puppet/provider/glance_image/glance.rb +++ b/lib/puppet/provider/glance_image/glance.rb @@ -13,25 +13,35 @@ Puppet::Type.type(:glance_image).provide( commands :glance => 'glance' - def self.prefetch(resource) - # rebuild the cache for every puppet run - @image_hash = nil - end - - def self.image_hash - @image_hash ||= build_image_hash - end - - def image_hash - self.class.image_hash - end + mk_resource_methods def self.instances - image_hash.collect do |k, v| - new(:name => k) + list_glance_images.collect do |image| + attrs = get_glance_image_attrs(image) + new( + :ensure => :present, + :name => attrs['name'], + :is_public => attrs['public'], + :container_format => attrs['container format'], + :id => attrs['id'], + :disk_format => attrs['disk format'] + ) end end + def self.prefetch(resources) + images = instances + resources.keys.each do |name| + if provider = images.find{ |pkg| pkg.name == name } + resources[name].provider = provider + end + end + end + + def exists? + @property_hash[:ensure] == :present + end + def create stdin = nil if resource[:source] @@ -50,64 +60,47 @@ Puppet::Type.type(:glance_image).provide( raise(Puppet::Error, "Must specify either source or location") end if stdin - auth_glance_stdin('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) + result = auth_glance_stdin('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) else - auth_glance('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) + results = auth_glance('add', "name=#{resource[:name]}", "is_public=#{resource[:is_public]}", "container_format=#{resource[:container_format]}", "disk_format=#{resource[:disk_format]}", location) + end + if results =~ /Added new image with ID: (\S+)/ + @property_hash = { + :ensure => :present, + :name => resource[:name], + :is_public => resource[:is_public], + :container_format => resource[:container_format], + :disk_format => resource[:disk_format], + :id => $1 + } + else + fail("did not get expected message from image creation, got #{results}") end - end - - def exists? - image_hash[resource[:name]] end def destroy - auth_glance('delete', '-f', image_hash[resource[:name]]['id']) - end - - def location - image_hash[resource[:name]]['location'] + auth_glance('delete', id) + @property_hash[:ensure] = :absent end def location=(value) - auth_glance('update', image_hash[resource[:name]]['id'], "location=#{value}") - end - - def is_public - image_hash[resource[:name]]['public'] + auth_glance('update', id, "location=#{value}") end def is_public=(value) - auth_glance('update', image_hash[resource[:name]]['id'], "is_public=#{value}") - end - - def disk_format - image_hash[resource[:name]]['disk format'] + auth_glance('update', id, "is_public=#{value}") end def disk_format=(value) - auth_glance('update', image_hash[resource[:name]]['id'], "disk_format=#{value}") - end - - def container_format - image_hash[resource[:name]]['container format'] + auth_glance('update', id, "disk_format=#{value}") end def container_format=(value) - auth_glance('update', image_hash[resource[:name]]['id'], "container_format=#{value}") + auth_glance('update', id, "container_format=#{value}") end - def id - image_hash[resource[:name]]['id'] + def id=(id) + fail('id is read only') end - private - def self.build_image_hash - hash = {} - list_glance_images.each do |image| - attrs = get_glance_image_attrs(image) - hash[attrs['name'].to_s] = attrs - end - hash - end end - From 7f0ddd2c55485cf569bf0d21748b43828000695e Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Sun, 3 Mar 2013 20:05:25 -0800 Subject: [PATCH 09/12] remove 2.6 support for travis file I am no longer supporting it. also remove create resources b/c it ships with puppet >= 2.7 --- .fixtures.yml | 1 - .travis.yml | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index be989960..ea14599d 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -6,6 +6,5 @@ fixtures: "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git" "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git" 'inifile': 'git://github.com/cprice-puppet/puppetlabs-inifile' - "create_resources": 'git://github.com/puppetlabs/puppetlabs-create_resources' symlinks: "glance": "#{source_dir}" diff --git a/.travis.yml b/.travis.yml index dd3394d8..ae9c4c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,12 @@ rvm: - 1.8.7 - 1.9.3 - ruby-head +branches: + only: + - master + - folsom + - essex env: - - PUPPET_GEM_VERSION="~> 2.6" - PUPPET_GEM_VERSION="~> 2.7" - PUPPET_GEM_VERSION="~> 3.0" matrix: From 7cbd4bbf8c6e896bac53467a8102539272f06664 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Fri, 11 Jan 2013 16:07:21 -0800 Subject: [PATCH 10/12] changes required to support purging In order for the ini file type to support purging, the file path must be accessible on the class instance. This patch was made to test some new functionality being added to the inifile type https://github.com/cprice-puppet/puppetlabs-inifile/pull/25 It does effect backwards compat of this native type so its ok to go ahead and merge. --- lib/puppet/provider/glance_api_config/ini_setting.rb | 7 ++++++- lib/puppet/provider/glance_api_paste_ini/ini_setting.rb | 7 ++++++- lib/puppet/provider/glance_cache_config/ini_setting.rb | 7 ++++++- lib/puppet/provider/glance_registry_config/ini_setting.rb | 7 ++++++- .../provider/glance_registry_paste_ini/ini_setting.rb | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/lib/puppet/provider/glance_api_config/ini_setting.rb b/lib/puppet/provider/glance_api_config/ini_setting.rb index b3cb0952..4323ae8c 100644 --- a/lib/puppet/provider/glance_api_config/ini_setting.rb +++ b/lib/puppet/provider/glance_api_config/ini_setting.rb @@ -15,8 +15,13 @@ Puppet::Type.type(:glance_api_config).provide( '=' end - def file_path + def self.file_path '/etc/glance/glance-api.conf' end + # this needs to be removed. This has been replaced with the class method + def file_path + self.class.file_path + end + end diff --git a/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb b/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb index b8f36849..d624d64b 100644 --- a/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb +++ b/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb @@ -15,8 +15,13 @@ Puppet::Type.type(:glance_api_paste_ini).provide( '=' end - def file_path + def self.file_path '/etc/glance/glance-api-paste.ini' end + # added for backwards compatibility with older versions of inifile + def file_path + self.class.file_path + end + end diff --git a/lib/puppet/provider/glance_cache_config/ini_setting.rb b/lib/puppet/provider/glance_cache_config/ini_setting.rb index 71f0c9a9..579dfb46 100644 --- a/lib/puppet/provider/glance_cache_config/ini_setting.rb +++ b/lib/puppet/provider/glance_cache_config/ini_setting.rb @@ -15,8 +15,13 @@ Puppet::Type.type(:glance_cache_config).provide( '=' end - def file_path + def self.file_path '/etc/glance/glance-cache.conf' end + # added for backwards compatibility with older versions of inifile + def file_path + self.class.file_path + end + end diff --git a/lib/puppet/provider/glance_registry_config/ini_setting.rb b/lib/puppet/provider/glance_registry_config/ini_setting.rb index 1a3fdb4b..5f843b5e 100644 --- a/lib/puppet/provider/glance_registry_config/ini_setting.rb +++ b/lib/puppet/provider/glance_registry_config/ini_setting.rb @@ -15,8 +15,13 @@ Puppet::Type.type(:glance_registry_config).provide( '=' end - def file_path + def self.file_path '/etc/glance/glance-registry.conf' end + # added for backwards compatibility with older versions of inifile + def file_path + self.class.file_path + end + end diff --git a/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb b/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb index 986bf8c6..36cb7e12 100644 --- a/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb +++ b/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb @@ -15,8 +15,13 @@ Puppet::Type.type(:glance_registry_paste_ini).provide( '=' end - def file_path + def self.file_path '/etc/glance/glance-registry-paste.ini' end + # added for backwards compatibility with older versions of inifile + def file_path + self.class.file_path + end + end From 806325be4e8c5a6565ad594017d357d55b9a13ab Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 5 Mar 2013 14:03:17 -0800 Subject: [PATCH 11/12] update travis file to add 2.6 and 3.1 support --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index ae9c4c75..14486174 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: ruby bundler_args: --without development +before_script: + - echo $PUPPET_GEM_VERSION | grep '2.6' && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true script: "bundle exec rake spec SPEC_OPTS='--format documentation'" rvm: - 1.8.7 @@ -11,8 +13,10 @@ branches: - folsom - essex env: + - PUPPET_GEM_VERSION="~> 2.6" - PUPPET_GEM_VERSION="~> 2.7" - PUPPET_GEM_VERSION="~> 3.0" + - PUPPET_GEM_VERSION="~> 3.1" matrix: allow_failures: - rvm: ruby-head From b14a29d87c2ed44082c5ebdd27437bfe908db06c Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 19 Mar 2013 10:29:16 -0700 Subject: [PATCH 12/12] release 1.1.0 --- CHANGELOG | 7 +++++++ Modulefile | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 48239fd1..c85dbc1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +* 2013-03-19 1.1.0 +- update travis matrix (add ruby 1.9, puppet 3.0) +- implement provider changes for purging +- refactor of glance_image native types +- remove /v1 from endpoints +- allow specifying https for public endpoint +- parse credentials out of apt-paste.conf * 2012-11-02 1.0.0 - Add travisci support to repo - Remove essex support diff --git a/Modulefile b/Modulefile index 9ec86042..2e4742e7 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'puppetlabs-glance' -version '1.0.0' +version '1.1.0' source 'git://github.com/puppetlabs/puppetlabs-glance' author 'Puppet Labs' license 'Apache' @@ -8,6 +8,6 @@ description 'Openstack Glance module for folsom. Tested on Ubuntu Precise and RH project_page 'http://github.com/puppetlabs/puppetlabs-glance' dependency 'cprice404/inifile', '>= 0.9.0' -dependency 'puppetlabs/keystone', '>= 1.0.1' +dependency 'puppetlabs/keystone', '>= 1.1.0' dependency 'puppetlabs/mysql', '>= 0.5.0' dependency 'puppetlabs/stdlib', '>= 2.4.0'