openstack/openstack-ansible
Code Issues Proposed changes

Ensure that the filters_path is correctly updated

Browse Source 
This patch ensures that when using the sources-branch-updater
the filters_path correctly uses the <service>_conf_dir variable
instead of the statically set /etc/<service> path.

Change-Id: I19c160905f5a2517f8df3a587c2fc33371c156ed
This commit is contained in:
Jesse Pretorius
2016-08-30 11:25:18 +01:00
committed by Jesse Pretorius (odyssey4me)
parent fa9c114e51
commit 5ee185e475
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/sources-branch-updater.sh
View File

@@ -118,7 +118,11 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \;
# Tweak the rootwrap conf files
# Tweak the rootwrap conf filters_path
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
sed -i.bak "s|filters_path=/etc/neutron|filters_path={{ ${repo_name}_conf_dir }}" {} \;
# Tweak the rootwrap conf exec_dirs
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
sed -i.bak "s|exec_dirs=|exec_dirs={{ ${repo_name}_bin }},|" {} \;