openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Refactor definition of lock path

Browse Source 
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: I9bfda41d3916aa31249e36e8ac7cad9e0767d285
This commit is contained in:
Dmitriy Rabotyagov 2021-11-30 12:06:24 +02:00
parent 2d48102f5a
commit ee144c110f
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/main.yml
View File

@ -131,8 +131,8 @@
systemd_user_name: "{{ neutron_system_user_name }}" systemd_user_name: "{{ neutron_system_user_name }}"
systemd_group_name: "{{ neutron_system_group_name }}" systemd_group_name: "{{ neutron_system_group_name }}"
systemd_tempd_prefix: openstack systemd_tempd_prefix: openstack
systemd_slice_name: neutron systemd_slice_name: "{{ neutron_system_slice_name }}"
systemd_lock_path: /var/lock/neutron systemd_lock_dir: "{{ neutron_lock_dir }}"
systemd_CPUAccounting: true systemd_CPUAccounting: true
systemd_BlockIOAccounting: true systemd_BlockIOAccounting: true
systemd_MemoryAccounting: true systemd_MemoryAccounting: true

3
tasks/neutron_pre_install.yml
View File

@ -69,9 +69,6 @@
mode: "0750" mode: "0750"
owner: "root" owner: "root"
group: "root" group: "root"
- path: "/var/cache/neutron"
- path: "{{ neutron_lock_path }}"
- path: "/var/run/neutron"
- path: "{{ neutron_system_home_folder }}" - path: "{{ neutron_system_home_folder }}"
mode: "0755" mode: "0755"
- path: "{{ neutron_system_home_folder }}/ha_confs" - path: "{{ neutron_system_home_folder }}/ha_confs"

2
templates/neutron.conf.j2
View File

@ -237,7 +237,7 @@ transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_
# Concurrency (locking mechanisms) # Concurrency (locking mechanisms)
[oslo_concurrency] [oslo_concurrency]
lock_path = {{ neutron_lock_path }} lock_path = {{ neutron_lock_dir }}/{{ neutron_system_slice_name }}
{% if neutron_services['neutron-server']['group'] in group_names and 'sfc' in neutron_plugin_base %} {% if neutron_services['neutron-server']['group'] in group_names and 'sfc' in neutron_plugin_base %}
# ODL-SFC # ODL-SFC

3
vars/main.yml
View File

@ -131,12 +131,13 @@ neutron_venv_packages: >-
neutron_conf_dir: /etc/neutron neutron_conf_dir: /etc/neutron
neutron_conf_version_dir: "{{ (neutron_install_method == 'distro') | ternary(neutron_conf_dir, (neutron_bin | dirname) + '/etc/neutron') }}" neutron_conf_version_dir: "{{ (neutron_install_method == 'distro') | ternary(neutron_conf_dir, (neutron_bin | dirname) + '/etc/neutron') }}"
neutron_lock_path: "/var/lock/neutron" neutron_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
neutron_system_user_name: neutron neutron_system_user_name: neutron
neutron_system_group_name: neutron neutron_system_group_name: neutron
neutron_system_comment: neutron system user neutron_system_comment: neutron system user
neutron_system_shell: /bin/false neutron_system_shell: /bin/false
neutron_system_home_folder: "/var/lib/{{ neutron_system_user_name }}" neutron_system_home_folder: "/var/lib/{{ neutron_system_user_name }}"
neutron_system_slice_name: neutron
### ###
### DB (Galera) integration ### DB (Galera) integration