update cookbook dependencies for next release

* also a minor change in the specs to fit the identity v3 refactoring

Depends-On: Ib256c315d5439beb8d4ec83c5cc7d7c9b182378a
Depends-On: Ic6b00a08ec29a9a7c04a72c743af5f756db45edf
Change-Id: I5a8802103373b59effd8db18502a83563c085414
This commit is contained in:
Jan Klare 2016-12-05 12:29:31 +01:00
parent 8d79402261
commit ab456b80be
3 changed files with 5 additions and 13 deletions

View File

@ -6,3 +6,5 @@ cookbook "openstack-common",
github: "openstack/cookbook-openstack-common"
cookbook "openstack-identity",
github: "openstack/cookbook-openstack-identity"
cookbook "openstackclient",
github: "cloudbau/cookbook-openstackclient"

View File

@ -12,6 +12,6 @@ version '14.0.0'
supports os
end
depends 'apache2', '~> 3.1'
depends 'apache2', '~> 3.2'
depends 'openstack-common', '>= 14.0.0'
depends 'openstack-identity', '>= 14.0.0'

View File

@ -260,16 +260,6 @@ describe 'openstack-dashboard::horizon' do
end
end
it 'sets the proper value for identity v2.0 with volume default v2 from common attributes' do
node.set['openstack']['api']['auth']['version'] = 'v2.0'
[
/^\s*"identity": 2\.0,$/,
/^\s*"volume": 2$/
].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'sets the proper value for identity v3.0 with volume default v2 from common attributes' do
node.set['openstack']['api']['auth']['version'] = 'v3.0'
[
@ -374,11 +364,11 @@ describe 'openstack-dashboard::horizon' do
end
it 'has a keystone url' do
expect(chef_run).to render_file(file.name).with_content(%r{OPENSTACK_KEYSTONE_URL = "http://127.0.0.1:5000/v2.0"})
expect(chef_run).to render_file(file.name).with_content(%r{OPENSTACK_KEYSTONE_URL = "http://127.0.0.1:5000/v3"})
end
it 'has a keystone admin url' do
expect(chef_run).to render_file(file.name).with_content(%r{OPENSTACK_KEYSTONE_ADMIN_URL = "http://127.0.0.1:35357/v2.0"})
expect(chef_run).to render_file(file.name).with_content(%r{OPENSTACK_KEYSTONE_ADMIN_URL = "http://127.0.0.1:35357/v3"})
end
it 'has a keystone default role' do