summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykyta Karpin <mkarpin@mirantis.com>2017-04-19 11:50:26 +0300
committerMykyta Karpin <mkarpin@mirantis.com>2017-04-19 15:40:31 +0300
commita0fe5a91dfe813a5c89d559db5aaf4a37af21ec6 (patch)
tree2c3862cf7873660f3ab51b91ed5f52842f9339c7
parentdd4259fd8ad14f330795caafbe0f739e25323be2 (diff)
Avoid duplicate declaration of reauth method
Upstream patch https://review.openstack.org/#/c/457869 breaks noop tests, we need prepare heat task to this. Change-Id: I53b36677a1c7427bee5c5f20e3a04e49d9bbffa2 Closes-Bug: #1684042
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Code-Review+1: Michael Polenchuk <mpolenchuk@mirantis.com> Code-Review+2: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Workflow+1: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 20 Apr 2017 08:11:44 +0000 Reviewed-on: https://review.openstack.org/457928 Project: openstack/fuel-library Branch: refs/heads/master
-rw-r--r--deployment/puppet/openstack_tasks/manifests/heat/heat.pp24
-rw-r--r--tests/noop/spec/hosts/heat/heat_spec.rb2
2 files changed, 14 insertions, 12 deletions
diff --git a/deployment/puppet/openstack_tasks/manifests/heat/heat.pp b/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
index 77bee11..37b11b6 100644
--- a/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
+++ b/deployment/puppet/openstack_tasks/manifests/heat/heat.pp
@@ -106,16 +106,6 @@ class openstack_tasks::heat::heat {
106 Tweaks::Ubuntu_service_override['heat-engine'] -> Service['heat-engine'] 106 Tweaks::Ubuntu_service_override['heat-engine'] -> Service['heat-engine']
107 } 107 }
108 108
109 if $sahara_hash['enabled'] and !$storage_hash['objects_ceph'] {
110 heat_config {
111 'DEFAULT/reauthentication_auth_method': value => 'trusts';
112 }
113 } else {
114 heat_config {
115 'DEFAULT/reauthentication_auth_method': ensure => absent;
116 }
117 }
118
119 # Turn on Caching for Heat validation process 109 # Turn on Caching for Heat validation process
120 heat_config { 110 heat_config {
121 'cache/enabled': value => true; 111 'cache/enabled': value => true;
@@ -239,6 +229,20 @@ class openstack_tasks::heat::heat {
239 instance_connection_is_secure => '0', 229 instance_connection_is_secure => '0',
240 } 230 }
241 231
232 # [mkarpin] TODO: rework this when
233 # https://review.openstack.org/#/c/457869/ is merged
234 if $sahara_hash['enabled'] and !$storage_hash['objects_ceph'] {
235 if !defined(Heat_config['DEFAULT/reauthentication_auth_method']) {
236 heat_config { 'DEFAULT/reauthentication_auth_method':
237 value => 'trusts'
238 }
239 } else {
240 Heat_config <| title == 'DEFAULT/reauthentication_auth_method' |> {
241 value => 'trusts'
242 }
243 }
244 }
245
242 # TODO(dmburmistrov): completely remove pacemaker for heat-engine after release "N" 246 # TODO(dmburmistrov): completely remove pacemaker for heat-engine after release "N"
243 if hiera('heat_ha_engine', true) and hiera('heat_pcs_engine', false) { 247 if hiera('heat_ha_engine', true) and hiera('heat_pcs_engine', false) {
244 if $deployment_mode in ['ha', 'ha_compact'] { 248 if $deployment_mode in ['ha', 'ha_compact'] {
diff --git a/tests/noop/spec/hosts/heat/heat_spec.rb b/tests/noop/spec/hosts/heat/heat_spec.rb
index 4ea3091..306a5a2 100644
--- a/tests/noop/spec/hosts/heat/heat_spec.rb
+++ b/tests/noop/spec/hosts/heat/heat_spec.rb
@@ -138,8 +138,6 @@ describe manifest do
138 it 'should configure reauthentication_auth_method' do 138 it 'should configure reauthentication_auth_method' do
139 if sahara and !storage_hash['objects_ceph'] 139 if sahara and !storage_hash['objects_ceph']
140 should contain_heat_config('DEFAULT/reauthentication_auth_method').with_value('trusts') 140 should contain_heat_config('DEFAULT/reauthentication_auth_method').with_value('trusts')
141 else
142 should contain_heat_config('DEFAULT/reauthentication_auth_method').with_ensure('absent')
143 end 141 end
144 end 142 end
145 143