| commit | 2ba5a1f9de2c55d125505578f56b90b22f01d5a7 | [log] [tgz] |
|---|---|---|
| author | Vasyl Saienko <vsaienko@mirantis.com> | Thu Jul 12 10:53:43 2018 +0300 |
| committer | Vasyl Saienko <vsaienko@mirantis.com> | Thu Jul 12 10:54:03 2018 +0300 |
| tree | d6e3c6865480c86ad1d0747630ffeaf675e81985 | |
| parent | 56126fe45cf0ae34edf2f7075e179699b426d81b [diff] |
[Queens] Fix cacert file for kastellan Change-Id: I036b99c7f926fa761ef0fe0cea442c5020140095
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian index c3750a7..6d89d7f 100644 --- a/cinder/files/queens/cinder.conf.controller.Debian +++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -3260,6 +3260,7 @@ {%- set _data = {} %} {%- do _data.update(controller.identity) %} {%- do _data.update(controller.get('barbican', {})) %} +{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': controller.cacert_file}) %}{% endif %} # # From castellan.config #
diff --git a/cinder/files/queens/cinder.conf.volume.Debian b/cinder/files/queens/cinder.conf.volume.Debian index 6c4e023..fc9c7f4 100644 --- a/cinder/files/queens/cinder.conf.volume.Debian +++ b/cinder/files/queens/cinder.conf.volume.Debian
@@ -3260,6 +3260,7 @@ {%- set _data = {} %} {%- do _data.update(volume.identity) %} {%- do _data.update(volume.get('barbican', {})) %} +{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': volume.cacert_file}) %}{% endif %} # # From castellan.config #