ovn: remove rootwrap.d from the list of filters_path

The directory doesn't exist, and we move the filter files under /usr/share/neutron/rootwrap in rpms. See: https://github.com/rdo-packages/neutron-distgit/blob/antelope-rdo/openstack-neutron.spec#L499
openstack-k8s-operators · Sep 14, 2023 · c7cf006 · c7cf006
1 parent f4adc32
commit c7cf006
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/roles/edpm_ovn/defaults/main.yml b/roles/edpm_ovn/defaults/main.yml
@@ -101,7 +101,7 @@ edpm_ovn_metadata_agent_oslo_concurrency_lock_patch: '$state_path/lock'
 edpm_ovn_metadata_agent_agent_report_interval: '300'
 
 # rootwrap.conf
-edpm_ovn_metadata_agent_rootwrap_DEFAULT_filters_path: '/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap'
+edpm_ovn_metadata_agent_rootwrap_DEFAULT_filters_path: '/usr/share/neutron/rootwrap'
 edpm_ovn_metadata_agent_rootwrap_DEFAULT_exec_dirs: '/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin,/etc/neutron/kill_scripts'
 edpm_ovn_metadata_agent_rootwrap_DEFAULT_use_syslog: 'False'
 edpm_ovn_metadata_agent_rootwrap_DEFAULT_syslog_log_facility: 'syslog'

diff --git a/roles/edpm_ovn/meta/argument_specs.yml b/roles/edpm_ovn/meta/argument_specs.yml
@@ -208,7 +208,7 @@ argument_specs:
         description: ''
         type: str
       edpm_ovn_metadata_agent_rootwrap_DEFAULT_filters_path:
-        default: /etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap
+        default: /usr/share/neutron/rootwrap
         description: ''
         type: str
       edpm_ovn_metadata_agent_rootwrap_DEFAULT_rlimit_nofile: