openstack/puppet-heat
Code Issues Proposed changes

Changed keystone_ec2_uri to be optional

Browse Source 
Param keystone_ec2_uri was providing default value. It was raising an
engine service error on ifras where ec2 endpoint was not created.

Change-Id: I48c47a2c59ec89212a45125b373844e340731fd9
This commit is contained in:
Daniel Pawlik 2017-08-21 10:23:38 +00:00
parent 70232ae4b4
commit 2d78f9253d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -189,6 +189,8 @@
# Defaults to ::os_service_default
#
# [*keystone_ec2_uri*]
# (optional) Authentication Endpoint URI for ec2 service.
# Defaults to ::os_service_default
#
# [*database_connection*]
# (optional) Connection url for the heat database.
@ -321,7 +323,7 @@ class heat(
$package_ensure = 'present',
$debug = undef,
$log_dir = undef,
$keystone_ec2_uri = 'http://127.0.0.1:5000/v2.0/ec2tokens',
$keystone_ec2_uri = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::os_service_default,

5
releasenotes/notes/drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml Normal file
View File

@ -0,0 +1,5 @@
---
other:
- |
Drop keystone_ec2_uri default value because engine was down when user is
checking heat service status and the endpoint was not created in Keystone.

3
spec/classes/heat_init_spec.rb
View File

@ -20,7 +20,6 @@ describe 'heat' do
:rabbit_virtual_host => '<SERVICE DEFAULT>',
:database_connection => 'mysql+pymysql://user@host/database',
:database_idle_timeout => 3600,
:keystone_ec2_uri => 'http://127.0.0.1:5000/v2.0/ec2tokens',
:flavor => 'keystone',
:heat_clients_url => '<SERVICE DEFAULT>',
:purge_config => false,
@ -147,7 +146,7 @@ describe 'heat' do
end
it 'configures keystone_ec2_uri' do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( params[:keystone_ec2_uri] )
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( '<SERVICE DEFAULT>' )
end
it 'configures yaql_limit_iterators' do