From 2d78f9253d7dce4e1a49aedcd394b3b1e626a95f Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 21 Aug 2017 10:23:38 +0000 Subject: [PATCH] Changed keystone_ec2_uri to be optional 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 --- manifests/init.pp | 4 +++- ...drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml | 5 +++++ spec/classes/heat_init_spec.rb | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml diff --git a/manifests/init.pp b/manifests/init.pp index cb4bda75..9ffba8ed 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/releasenotes/notes/drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml b/releasenotes/notes/drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml new file mode 100644 index 00000000..98283ab3 --- /dev/null +++ b/releasenotes/notes/drop_keystone_ec2_uri_default_value-c6925ba650861456.yaml @@ -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. diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb index 548c74fe..1e2107a7 100644 --- a/spec/classes/heat_init_spec.rb +++ b/spec/classes/heat_init_spec.rb @@ -20,7 +20,6 @@ describe 'heat' do :rabbit_virtual_host => '', :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 => '', :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( '' ) end it 'configures yaql_limit_iterators' do