From 442f6a0ed7d039bfacd752cd2c96634e6ee61083 Mon Sep 17 00:00:00 2001 From: Sergii Rizvan Date: Mon, 29 May 2017 13:50:38 +0300 Subject: [PATCH] Corrected default limits filter in nova API The old syntax that used % symbols, caused some errors upon a restart of the nova-api. Replacing the % and parentheses with the double quotes allows the API to start without errors. Change-Id: I96c00590390c6caf0a17a43e68ede111684b3110 Closes-Bug: #1683496 --- .../manifests/openstack_controller/openstack_controller.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp index 5e18f2778b..f6596b1632 100644 --- a/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp +++ b/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp @@ -246,8 +246,8 @@ class openstack_tasks::openstack_controller::openstack_controller { $delete_limit = $merged_limits['DELETE'] $post_servers_limit = $merged_limits['POST_SERVERS'] $nova_rate_limits_string = inline_template('<%="(POST, *, .*, #{@post_limit} , MINUTE);\ - (POST, %(*/servers), ^/servers, #{@post_servers_limit} , DAY);(PUT, %(*) , .*, #{@put_limit}\ - , MINUTE);(GET, %(*changes-since*), .*changes-since.*, #{@get_limit}, MINUTE);(DELETE, %(*),\ + (POST, \"*/servers\", ^/servers, #{@post_servers_limit} , DAY);(PUT, \"*\" , .*, #{@put_limit}\ + , MINUTE);(GET, \"*changes-since*\", .*changes-since.*, #{@get_limit}, MINUTE);(DELETE, \"*\",\ .*, #{@delete_limit} , MINUTE)" %>') class { '::nova::keystone::authtoken':