Sync Glance module 6.0.0 with upstream

v6.0.0 commit 7c03b0b80ae6e23bc01725532c24b2a23dec40c9

Partially implements: blueprint upgrade-openstack-puppet-modules

Change-Id: I4be830cf1bc6d10b95858cc126401c6547371804

deployment/puppet/glance/CHANGELOG.md

@@ -1,3 +1,31 @@
+##2015-07-08 - 6.0.0
+###Summary
+
+This is a backwards-incompatible major release for OpenStack Kilo.
+
+####Backwards-incompatible changes
+- Move rabbit/kombu settings to oslo_messaging_rabbit section
+- Remove sql_connection and sql_idle_timeout deprecated parameters
+- api: change default pipeline
+- Separate api and registry packages for Red Hat
+- python-ceph no longer exists in el7, use python-rbd
+
+####Features
+- Puppet 4.x support
+- Refactorise Keystone resources management
+- Migrate postgresql backend to use openstacklib::db::postgresql
+- Add support for identity_uri
+- Service Validation for Glance-API
+- Create a sync_db boolean for Glance
+- make service description configurable
+
+####Bugfixes
+- Fix API/Registry ensure for Ubuntu
+
+####Maintenance
+- Acceptance tests with Beaker
+- Fix spec tests for RSpec 3.x and Puppet 4.x
+
 ##2015-06-17 - 5.1.0
 ###Summary
 

deployment/puppet/glance/README.md

@@ -1,7 +1,7 @@
 glance
 =======
 
-5.1.0 - 2014.2 - Juno
+6.0.0 - 2015.1 - Kilo
 
 #### Table of Contents
 

deployment/puppet/glance/metadata.json

@@ -1,6 +1,6 @@
 {
-  "name": "stackforge-glance",
-  "version": "5.1.0",
+  "name": "openstack-glance",
+  "version": "6.0.0",
   "author": "Puppet Labs and OpenStack Contributors",
   "summary": "Puppet module for OpenStack Glance",
   "license": "Apache-2.0",
@@ -32,8 +32,8 @@
   "description": "Installs and configures OpenStack Glance (Image Service).",
   "dependencies": [
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "stackforge/keystone", "version_requirement": ">=5.0.0 <6.0.0" },
+    { "name": "openstack/keystone", "version_requirement": ">=6.0.0 <7.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
-    { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0 <6.0.0" }
+    { "name": "openstack/openstacklib", "version_requirement": ">=6.0.0 <7.0.0" }
   ]
 }

deployment/puppet/glance/spec/spec_helper_acceptance.rb

@@ -6,38 +6,51 @@ run_puppet_install_helper
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1]
 
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
-    # Install module
+    # Install module and dependencies
     hosts.each do |host|
 
       # install git
       install_package host, 'git'
 
-      # clean out any module cruft
-      shell('rm -fr /etc/puppet/modules/*')
+      zuul_ref = ENV['ZUUL_REF']
+      zuul_branch = ENV['ZUUL_BRANCH']
+      zuul_url = ENV['ZUUL_URL']
 
-      # install library modules from the forge
-      on host, puppet('module','install', '--force', 'puppetlabs-mysql', '--version', '3.2.0'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => [0,1] }
+      repo = 'openstack/puppet-openstack-integration'
 
-      # install puppet modules from git, use master
-      shell('git clone https://git.openstack.org/openstack/puppet-openstacklib /etc/puppet/modules/openstacklib')
-      shell('git clone https://git.openstack.org/openstack/puppet-keystone /etc/puppet/modules/keystone')
-      shell('git clone https://git.openstack.org/openstack/puppet-openstack_extras /etc/puppet/modules/openstack_extras')
+      # Start out with clean moduledir, don't trust r10k to purge it
+      on host, "rm -rf /etc/puppet/modules/*"
+      # Install dependent modules via git or zuul
+      r = on host, "test -e /usr/zuul-env/bin/zuul-cloner", { :acceptable_exit_codes => [0,1] }
+      if r.exit_code == 0
+        zuul_clone_cmd = '/usr/zuul-env/bin/zuul-cloner '
+        zuul_clone_cmd += '--cache-dir /opt/git '
+        zuul_clone_cmd += "--zuul-ref #{zuul_ref} "
+        zuul_clone_cmd += "--zuul-branch #{zuul_branch} "
+        zuul_clone_cmd += "--zuul-url #{zuul_url} "
+        zuul_clone_cmd += "git://git.openstack.org #{repo}"
+        on host, zuul_clone_cmd
+      else
+        on host, "git clone https://git.openstack.org/#{repo} #{repo}"
+      end
+
+      on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh"
 
       # Install the module being tested
-      puppet_module_install(:source => proj_root, :module_name => 'glance')
+      on host, "rm -fr /etc/puppet/modules/#{modname}"
+      puppet_module_install(:source => proj_root, :module_name => modname)
+
+      on host, "rm -fr #{repo}"
+
       # List modules installed to help with debugging
-      on hosts[0], puppet('module','list'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module','list'), { :acceptable_exit_codes => [0] }
     end
   end
 end