summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Rizvan <srizvan@mirantis.com>2017-05-29 13:50:38 +0300
committerSergii Rizvan <srizvan@mirantis.com>2017-05-29 13:19:19 +0000
commit442f6a0ed7d039bfacd752cd2c96634e6ee61083 (patch)
tree7f961cbcf2e67d5359452236b37988475231f453
parent57bb7299b75ab5f9457878cc0bfb88af74ed767a (diff)
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
Notes
Notes (review): Code-Review+1: Michael Polenchuk <mpolenchuk@mirantis.com> Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Stanislaw Bogatkin <sbogatkin@mirantis.com> Code-Review+2: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Workflow+1: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 01 Jun 2017 13:18:37 +0000 Reviewed-on: https://review.openstack.org/468855 Project: openstack/fuel-library Branch: refs/heads/master
-rw-r--r--deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp4
1 files 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 5e18f27..f6596b1 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 {
246 $delete_limit = $merged_limits['DELETE'] 246 $delete_limit = $merged_limits['DELETE']
247 $post_servers_limit = $merged_limits['POST_SERVERS'] 247 $post_servers_limit = $merged_limits['POST_SERVERS']
248 $nova_rate_limits_string = inline_template('<%="(POST, *, .*, #{@post_limit} , MINUTE);\ 248 $nova_rate_limits_string = inline_template('<%="(POST, *, .*, #{@post_limit} , MINUTE);\
249 (POST, %(*/servers), ^/servers, #{@post_servers_limit} , DAY);(PUT, %(*) , .*, #{@put_limit}\ 249 (POST, \"*/servers\", ^/servers, #{@post_servers_limit} , DAY);(PUT, \"*\" , .*, #{@put_limit}\
250 , MINUTE);(GET, %(*changes-since*), .*changes-since.*, #{@get_limit}, MINUTE);(DELETE, %(*),\ 250 , MINUTE);(GET, \"*changes-since*\", .*changes-since.*, #{@get_limit}, MINUTE);(DELETE, \"*\",\
251 .*, #{@delete_limit} , MINUTE)" %>') 251 .*, #{@delete_limit} , MINUTE)" %>')
252 252
253 class { '::nova::keystone::authtoken': 253 class { '::nova::keystone::authtoken':