openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fix tmpfiles.d when multiple service are running.

Browse Source 
adding {{ neutron_lock_path }} for the neutron lock dir.

Change-Id: I661dd9da6b9a65be3266907e560703caa0a0d6af
This commit is contained in:
Marc Gariepy 2016-11-03 14:40:42 -04:00 committed by Jesse Pretorius (odyssey4me)
parent b62a312bf4
commit 1ee6c091f2
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -63,6 +63,7 @@ neutron_lib_dir: "{{ neutron_bin | dirname }}/lib/python2.7/site-packages/"
# Set the Neutron configuration path # Set the Neutron configuration path
neutron_conf_dir: /etc/neutron neutron_conf_dir: /etc/neutron
neutron_lock_path: "/var/lock/neutron"
# Enable/Disable designate # Enable/Disable designate
neutron_designate_enabled: False neutron_designate_enabled: False

6
tasks/neutron_init_systemd.yml
View File

@ -29,10 +29,10 @@
group: "{{ system_group }}" group: "{{ system_group }}"
mode: "02755" mode: "02755"
- name: Create tempfile.d entry - name: Create tmpfiles.d entry
template: template:
src: "neutron-systemd-tempfiles.j2" src: "neutron-systemd-tmpfiles.j2"
dest: "/etc/tmpfiles.d/neutron.conf" dest: "/etc/tmpfiles.d/{{ program_name }}.conf"
mode: "0644" mode: "0644"
owner: "root" owner: "root"
group: "root" group: "root"

2
tasks/neutron_pre_install.yml
View File

@ -44,7 +44,7 @@
- { path: "{{ neutron_conf_dir }}/rootwrap.d", owner: "root", group: "root" } - { path: "{{ neutron_conf_dir }}/rootwrap.d", owner: "root", group: "root" }
- { path: "/etc/sudoers.d", mode: "0750", owner: "root", group: "root" } - { path: "/etc/sudoers.d", mode: "0750", owner: "root", group: "root" }
- { path: "/var/cache/neutron" } - { path: "/var/cache/neutron" }
- { path: "/var/lock/neutron" } - { path: "{{ neutron_lock_path }}" }
- { path: "/var/run/neutron" } - { path: "/var/run/neutron" }
- { path: "{{ neutron_system_home_folder }}", mode: "0755" } - { path: "{{ neutron_system_home_folder }}", mode: "0755" }
- { path: "{{ neutron_system_home_folder }}/ha_confs" } - { path: "{{ neutron_system_home_folder }}/ha_confs" }

1
templates/neutron-systemd-tempfiles.j2 → templates/neutron-systemd-tmpfiles.j2
View File

@ -2,3 +2,4 @@
D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }} D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }} D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
D {{ neutron_lock_path }} 2755 {{ system_user }} {{ system_group }}

2
templates/neutron.conf.j2
View File

@ -197,4 +197,4 @@ transport_url = rabbit://{% for host in neutron_rabbitmq_telemetry_servers.split
# Concurrency (locking mechanisms) # Concurrency (locking mechanisms)
[oslo_concurrency] [oslo_concurrency]
lock_path = /var/lock/neutron lock_path = {{ neutron_lock_path }}