commit a9ca0ec043c333282fe8d3224800eab3b1fea083 Author: michaeltchapman Date: Tue Sep 29 13:31:15 2020 +1000 Support designate profile when redis is not available Designate can function without redis in testing environments like tripleo-standalone where multiple producers are not present. Change-Id: I1f8bb80cb7498cba12aae399321369dc55c33523 diff --git a/manifests/profile/base/designate/producer.pp b/manifests/profile/base/designate/producer.pp index 5fcc420..6e2080d 100644 --- a/manifests/profile/base/designate/producer.pp +++ b/manifests/profile/base/designate/producer.pp @@ -20,11 +20,11 @@ # # [*designate_redis_password*] # (Required) Password for the neutron redis user for the coordination url -# Defaults to hiera('designate_redis_password'), +# Defaults to hiera('designate_redis_password', false), # # [*redis_vip*] # (Required) Redis ip address for the coordination url -# Defaults to hiera('redis_vip'), +# Defaults to hiera('redis_vip', false), # # [*enable_internal_tls*] # (Optional) Whether TLS in the internal network is enabled or not. @@ -36,8 +36,8 @@ # Defaults to hiera('step') # class tripleo::profile::base::designate::producer ( - $designate_redis_password = hiera('designate_redis_password'), - $redis_vip = hiera('redis_vip'), + $designate_redis_password = hiera('designate_redis_password', false), + $redis_vip = hiera('redis_vip', false), $enable_internal_tls = hiera('enable_internal_tls', false), $step = Integer(hiera('step')), ) { @@ -50,8 +50,12 @@ class tripleo::profile::base::designate::producer ( } if $step >= 4 { - class { 'designate::producer': - backend_url => join(['redis://:', $designate_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]) + if $redis_vip { + class { 'designate::producer': + backend_url => join(['redis://:', $designate_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]) + } + } else { + include designate::producer } } }