openstack/openstack-ansible
Code Issues Proposed changes

Update Ceilometer paste file

Browse Source 
The source-branch-updater script did not pick up the
Ceilometer paste file update as it is named with an
underscore instead of a dash.

This patch updates the source-branch-updater and the
missed paste file from Ceilometer.

Change-Id: Iceda4807bd97dfb2625c9ab55c79ca35ff3efcf1
This commit is contained in:
Jesse Pretorius 2016-01-21 13:47:19 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 2b6c9c39fa
commit 2137f0f668
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_ceilometer/templates/api_paste.ini.j2
View File

@ -14,4 +14,4 @@ paste.app_factory = ceilometer.api.app:app_factory
paste.filter_factory = keystonemiddleware.auth_token:filter_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory
[filter:request_id] [filter:request_id]
paste.filter_factory = oslo.middleware:RequestId.factory paste.filter_factory = oslo_middleware:RequestId.factory

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

@ -95,11 +95,11 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
cp {} "playbooks/roles/os_${repo_name}/templates/policy.json.j2" \; cp {} "playbooks/roles/os_${repo_name}/templates/policy.json.j2" \;
# Tweak the paste files # Tweak the paste files
find ${repo_tmp_path}/etc -name "*-paste.ini" -exec \ find ${repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
sed -i.bak "s|hmac_keys = SECRET_KEY|hmac_keys = {{ ${repo_name}_profiler_hmac_key }}|" {} \; sed -i.bak "s|hmac_keys = SECRET_KEY|hmac_keys = {{ ${repo_name}_profiler_hmac_key }}|" {} \;
# Update the paste files # Update the paste files
find ${repo_tmp_path}/etc -name "*-paste.ini" -exec \ find ${repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
bash -c "name=\"{}\"; cp \${name} \"playbooks/roles/os_${repo_name}/templates/\$(basename \${name}).j2\"" \; bash -c "name=\"{}\"; cp \${name} \"playbooks/roles/os_${repo_name}/templates/\$(basename \${name}).j2\"" \;
# Tweak the rootwrap conf files # Tweak the rootwrap conf files