openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Add variable to enable integration with barbican"

Browse Source
This commit is contained in:
Jenkins 2017-02-08 15:16:52 +00:00 committed by Gerrit Code Review
commit 90a39df49c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -33,6 +33,9 @@ cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"
cinder_venv_download: "{{ not cinder_developer_mode | bool }}"
cinder_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/cinder.tgz
# Enable/Disable Barbican
cinder_barbican_enabled: False
# Enable/Disable Ceilometer
cinder_ceilometer_enabled: False

9
templates/cinder.conf.j2
View File

@ -126,8 +126,13 @@ profiler_enabled = {{ cinder_profiler_enabled }}
trace_sqlalchemy = {{ cinder_profiler_trace_sqlalchemy }}
hmac_keys = {{ cinder_profiler_hmac_key }}
[keymgr]
encryption_auth_url = {{ keystone_service_internaluri }}/v3
{% if cinder_barbican_enabled %}
[barbican]
auth_endpoint = {{ keystone_service_internaluri }}/v3
[key_manager]
api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
{% endif %}
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}