openstack
/
cookbook-openstack-common
Code Issues Proposed changes

invert the order of endpoint and bind_service attributes 

* endpoint type (admin, internal, public) and service (identitiy, network etc.)
  was switched during refactoring, this patch reverts this unintended switching

Change-Id: Iec485deaf415e4187a323435cce2b6bbadfc5d42
This commit is contained in:
Jan Klare 2016-02-12 18:31:46 +01:00
parent 1858c025b2
commit e198fd4eab
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/endpoints.rb
View File

@ -72,7 +72,7 @@ module ::Openstack
# 'public') for the given service.
%w(public internal admin).each do |ep_type|
define_method "#{ep_type}_endpoint" do |service|
uri_from_hash(node['openstack']['endpoints'][service][ep_type])
uri_from_hash(node['openstack']['endpoints'][ep_type][service])
end
end
end

2
spec/cli_spec.rb
View File

@ -15,7 +15,7 @@ describe 'openstack-common::default' do
describe 'openstack_command_env' do
before do
node.set['openstack']['endpoints']['identity']['admin'] = {
node.set['openstack']['endpoints']['admin']['identity'] = {
host: '127.0.0.1',
scheme: 'http',
path: '/v2.0',

16
spec/endpoints_spec.rb
View File

@ -30,8 +30,8 @@ describe 'openstack-common::default' do
uri_hash = {
'openstack' => {
'endpoints' => {
'compute-api' => {
ep_type => {
ep_type => {
'compute-api' => {
'uri' => 'http://localhost:8080/v2/%(tenant_id)s'
}
}
@ -48,8 +48,8 @@ describe 'openstack-common::default' do
uri_hash = {
'openstack' => {
'endpoints' => {
'compute-api' => {
ep_type => {
ep_type => {
'compute-api' => {
'uri' => 'http://localhost:1234/path'
}
}
@ -66,8 +66,8 @@ describe 'openstack-common::default' do
uri_hash = {
'openstack' => {
'endpoints' => {
'compute-api' => {
ep_type => {
ep_type => {
'compute-api' => {
'uri' => 'http://localhost',
'host' => 'ignored'
}
@ -84,8 +84,8 @@ describe 'openstack-common::default' do
uri_hash = {
'openstack' => {
'endpoints' => {
'compute-api' => {
ep_type => {
ep_type => {
'compute-api' => {
'host' => 'localhost',
'port' => '1234'
}