From 2137f0f66862fd168bc66da152a22159d071b6de Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 21 Jan 2016 13:47:19 +0000 Subject: [PATCH] Update Ceilometer paste file 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 --- playbooks/roles/os_ceilometer/templates/api_paste.ini.j2 | 2 +- scripts/sources-branch-updater.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/os_ceilometer/templates/api_paste.ini.j2 b/playbooks/roles/os_ceilometer/templates/api_paste.ini.j2 index 38a6a59a6d..98e2ce99a0 100644 --- a/playbooks/roles/os_ceilometer/templates/api_paste.ini.j2 +++ b/playbooks/roles/os_ceilometer/templates/api_paste.ini.j2 @@ -14,4 +14,4 @@ paste.app_factory = ceilometer.api.app:app_factory paste.filter_factory = keystonemiddleware.auth_token:filter_factory [filter:request_id] -paste.filter_factory = oslo.middleware:RequestId.factory +paste.filter_factory = oslo_middleware:RequestId.factory diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh index 7a0b2d6a0c..9d4ff5533f 100755 --- a/scripts/sources-branch-updater.sh +++ b/scripts/sources-branch-updater.sh @@ -95,11 +95,11 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do cp {} "playbooks/roles/os_${repo_name}/templates/policy.json.j2" \; # 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 }}|" {} \; # 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\"" \; # Tweak the rootwrap conf files