Revert bug fix 1279577
https://review.openstack.org/73108 The original change does not work for the case where the api-cfn recipe is included from within another recipe. This revert does not cause any harm, it justs registers api-cfn with identity unnecessarily. The real solution is probably a refactoring of the common identity recipe. Created blueprint identity-registration-cleanup for this future work. Change-Id: I43646182a7465cdddd55b1f840764ba1b147451e Closes-Bug: #1309123
This commit is contained in:
parent
ea9b5d3632
commit
63914207bf
|
@ -1,6 +1,10 @@
|
|||
# CHANGELOG for cookbook-openstack-orchestration
|
||||
|
||||
This file is used to list changes made in each version of cookbook-openstack-orchestration
|
||||
|
||||
## 9.1.1
|
||||
* Revert bug 1279577 Create api-cfn identity registrations bug 1309123
|
||||
|
||||
## 9.1.0
|
||||
* Add notification attributes
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ maintainer 'IBM, Inc.'
|
|||
license 'Apache 2.0'
|
||||
description 'Installs and configures the Heat Service'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
version '9.1.0'
|
||||
version '9.1.1'
|
||||
recipe 'openstack-orchestration::api', 'Start and configure the Heat API service'
|
||||
recipe 'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service'
|
||||
recipe 'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service'
|
||||
|
|
|
@ -65,7 +65,9 @@ openstack_identity_register 'Register Heat Orchestration Endpoint' do
|
|||
action :create_endpoint
|
||||
end
|
||||
|
||||
if node.run_list.include?('openstack-orchestration::api-cfn')
|
||||
# TODO: (MRV) Revert this change until a better solution can be found
|
||||
# Bug: #1309123 reverts 1279577
|
||||
# if node.run_list.include?('openstack-orchestration::api-cfn')
|
||||
|
||||
# Register Heat API Cloudformation Service
|
||||
openstack_identity_register 'Register Heat Cloudformation Service' do
|
||||
|
@ -90,7 +92,7 @@ if node.run_list.include?('openstack-orchestration::api-cfn')
|
|||
|
||||
action :create_endpoint
|
||||
end
|
||||
end
|
||||
# end
|
||||
|
||||
# Register Service Tenant
|
||||
openstack_identity_register 'Register Service Tenant' do
|
||||
|
|
|
@ -46,8 +46,10 @@ describe 'openstack-orchestration::identity_registration' do
|
|||
before do
|
||||
orchestration_stubs
|
||||
@chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS
|
||||
@chef_run.converge 'openstack-orchestration::identity_registration',
|
||||
'openstack-orchestration::api-cfn'
|
||||
@chef_run.converge 'openstack-orchestration::identity_registration'
|
||||
# TODO: (MRV) Revert this change until a better solution can be found
|
||||
# Bug: #1309123 reverts 1279577
|
||||
# 'openstack-orchestration::api-cfn'
|
||||
end
|
||||
|
||||
it 'Register Heat Cloudformation Service' do
|
||||
|
|
Loading…
Reference in New Issue