openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Refactor definition of lock path 

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/819300
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_service/+/819298
Change-Id: I674aa11ecfec2a2bc7bbc84865f9ec5f4a872ebe
This commit is contained in:
Dmitriy Rabotyagov 2021-11-25 14:09:06 +02:00 committed by Dmitriy Rabotyagov
parent a10ca593d7
commit 3370ad8e03
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -108,6 +108,7 @@ cinder_system_group_name: cinder
cinder_system_comment: cinder system user
cinder_system_shell: /bin/false
cinder_system_home_folder: "/var/lib/{{ cinder_system_user_name }}"
cinder_system_slice_name: cinder
## Manually specified cinder UID/GID
# Deployers can specify a UID for the cinder user as well as the GID for the
@ -121,7 +122,7 @@ cinder_system_home_folder: "/var/lib/{{ cinder_system_user_name }}"
# cinder_system_user_uid = <UID>
# cinder_system_group_gid = <GID>
cinder_lock_path: /var/lock/cinder
cinder_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
## Cinder Auth
cinder_service_admin_tenant_name: "service"

4
tasks/cinder_install.yml
View File

@ -47,8 +47,8 @@
systemd_user_name: "{{ cinder_system_user_name }}"
systemd_group_name: "{{ cinder_system_group_name }}"
systemd_tempd_prefix: openstack
systemd_slice_name: cinder
systemd_lock_path: /var/lock/cinder
systemd_slice_name: "{{ cinder_system_slice_name }}"
systemd_lock_dir: "{{ cinder_lock_dir }}"
systemd_CPUAccounting: true
systemd_BlockIOAccounting: true
systemd_MemoryAccounting: true

2
templates/cinder.conf.j2
View File

@ -122,7 +122,7 @@ driver = {{ (cinder_ceilometer_enabled | bool) | ternary('messagingv2', 'noop')
transport_url = {{ cinder_oslomsg_notify_transport }}://{% for host in cinder_oslomsg_notify_servers.split(',') %}{{ cinder_oslomsg_notify_userid }}:{{ cinder_oslomsg_notify_password }}@{{ host }}:{{ cinder_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_notify_vhost }}{% if cinder_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ cinder_oslomsg_notify_ssl_version }}&ssl_ca_file={{ cinder_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
[oslo_concurrency]
lock_path = {{ cinder_lock_path }}
lock_path = {{ cinder_lock_dir }}/{{ cinder_system_slice_name }}
[profiler]
enabled = {{ cinder_profiler_enabled }}