openstack
/
cookbook-openstack-integration-test
Code Issues Proposed changes

minor changes to adapt to refactored cookbooks 

* adapted enpoint calls for identity endpoints
* added installation of package curl since its used to upload/guard the upload
  of the needed images

Depends-On: I0547182085eed91d05384fdd7734408a839a9a2c
Depends-On: I3262b2e6f792f37c32a446e6567790b82bdd4613
Depends-On: Ifa5a7f4e1df47a3961976e64f654224864c3dcb4
Depends-On: I9ac9eeb29ab27f31394830e4b6f999d5870cc0e4
Depends-On: Idadc97bd7380d6c4f9f6f33d9c6b1215a5f24772
Implements: blueprint cookbook-refactoring
Change-Id: Ifd11f86c576d7dbb709bdd302d41e39e900e1b74
This commit is contained in:
Jan Klare 2016-02-04 11:49:08 +01:00 committed by Mark Vanderwiel
parent 467ee45456
commit 5d016a774b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
metadata.rb
View File

@ -5,15 +5,15 @@ maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache 2.0'
description 'Installs and configures the Tempest Integration Test Suite'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '12.0.0'
version '13.0.0'
recipe 'openstack-integration-test::setup', 'Installs and configures Tempest'
%w(ubuntu fedora redhat centos).each do |os|
%w(ubuntu redhat centos).each do |os|
supports os
end
depends 'openstack-common', '>= 12.0.0'
depends 'openstack-identity', '>= 12.0.0'
depends 'openstack-image', '>= 12.0.0'
depends 'openstack-compute', '>= 12.0.0'
depends 'openstack-block-storage', '>= 12.0.0'
depends 'openstack-common', '>= 13.0.0'
depends 'openstack-identity', '>= 13.0.0'
depends 'openstack-image', '>= 13.0.0'
depends 'openstack-compute', '>= 13.0.0'
depends 'openstack-block-storage', '>= 13.0.0'

6
recipes/setup.rb
View File

@ -35,10 +35,12 @@ platform_options['tempest_packages'].each do |pkg|
end
end
identity_admin_endpoint = admin_endpoint 'identity-admin'
package 'curl'
identity_admin_endpoint = admin_endpoint 'identity'
# Since this is testing things from the user's perspective,
# use the public identity endpoint
identity_api_endpoint = public_endpoint 'identity-api'
identity_api_endpoint = public_endpoint 'identity'
bootstrap_token = get_password 'token', 'openstack_identity_bootstrap_token'
auth_uri = ::URI.decode identity_admin_endpoint.to_s
admin_pass = get_password 'user', node['openstack']['identity']['admin_user']