Merge "Fix permissions for rootwrap files"

This commit is contained in:
Zuul 2024-02-19 17:56:53 +00:00 committed by Gerrit Code Review
commit 88085e47fd

View File

@ -23,12 +23,10 @@
state: "directory" state: "directory"
owner: "{{ item.owner | default(neutron_system_user_name) }}" owner: "{{ item.owner | default(neutron_system_user_name) }}"
group: "{{ item.group | default(neutron_system_group_name) }}" group: "{{ item.group | default(neutron_system_group_name) }}"
mode: "{{ item.mode | default('0755') }}" mode: "{{ item.mode | default('0750') }}"
with_items: with_items:
- path: "{{ neutron_conf_version_dir }}/plugins" - path: "{{ neutron_conf_version_dir }}/plugins"
mode: "0750"
- path: "{{ neutron_conf_version_dir }}/plugins/{{ neutron_plugin_type.split('.')[0] }}" - path: "{{ neutron_conf_version_dir }}/plugins/{{ neutron_plugin_type.split('.')[0] }}"
mode: "0750"
- path: "{{ neutron_conf_version_dir }}/rootwrap.d" - path: "{{ neutron_conf_version_dir }}/rootwrap.d"
owner: "root" owner: "root"
group: "root" group: "root"
@ -41,7 +39,7 @@
dest: "{{ neutron_conf_version_dir }}/rootwrap.d/" dest: "{{ neutron_conf_version_dir }}/rootwrap.d/"
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0640"
with_fileglob: with_fileglob:
- rootwrap.d/* - rootwrap.d/*
notify: notify:
@ -138,15 +136,6 @@
check_mode: false check_mode: false
with_items: "{{ neutron_core_files }}" with_items: "{{ neutron_core_files }}"
# NOTE(cloudnull): This will ensure strong permissions on all rootwrap files.
- name: Set rootwrap.d permissions
file:
path: "{{ neutron_conf_version_dir }}/rootwrap.d"
owner: "root"
group: "root"
mode: "0640"
recurse: true
- name: Copy neutron ml2 plugin config - name: Copy neutron ml2 plugin config
openstack.config_template.config_template: openstack.config_template.config_template:
src: "{{ ('plugin_conf_bare' not in neutron_plugins[item]) | ternary(neutron_plugins[item].plugin_ini ~ '.j2', omit) }}" src: "{{ ('plugin_conf_bare' not in neutron_plugins[item]) | ternary(neutron_plugins[item].plugin_ini ~ '.j2', omit) }}"