neutron: properly define region

Unlikey everywhere else, the key to set is region not region_name

Author: dirkmueller

chef/cookbooks/neutron/templates/default/neutron_lbaas.conf.erb

@@ -9,7 +9,7 @@ auth_url = <%= KeystoneHelper.versioned_service_URL(@keystone_settings["protocol
 admin_project_name = <%= @keystone_settings['service_tenant'] %>
 admin_user = <%= @keystone_settings['service_user'] %>
 admin_password = <%= @keystone_settings['service_password'] %>
-region_name = <%= @keystone_settings['endpoint_region'] %>
+region = <%= @keystone_settings['endpoint_region'] %>
 admin_user_domain = <%= @keystone_settings['admin_domain'] %>
 admin_project_domain = <%= @keystone_settings['admin_domain'] %>
 [service_providers]

chef/cookbooks/rabbitmq/attributes/default.rb

@@ -42,13 +42,14 @@
 default[:rabbitmq][:ha][:op][:start][:timeout] = "300s"
 default[:rabbitmq][:ha][:op][:promote][:timeout] = "180s"
 default[:rabbitmq][:ha][:op][:monitor][:interval] = "10s"
-default[:rabbitmq][:ha][:clustered_op][:start][:timeout] = "360s"
-default[:rabbitmq][:ha][:clustered_op][:stop][:timeout] = "120s"
-default[:rabbitmq][:ha][:clustered_op][:promote][:timeout] = "120s"
-default[:rabbitmq][:ha][:clustered_op][:demote][:timeout] = "120s"
+default[:rabbitmq][:ha][:clustered_op][:start][:timeout] = "540s"
+default[:rabbitmq][:ha][:clustered_op][:stop][:timeout] = "180s"
+default[:rabbitmq][:ha][:clustered_op][:promote][:timeout] = "180s"
+default[:rabbitmq][:ha][:clustered_op][:demote][:timeout] = "180s"
 default[:rabbitmq][:ha][:clustered_op][:notify][:timeout] = "180s"
 default[:rabbitmq][:ha][:clustered_op][:monitor] = [
-  { interval: "30s" }, { interval: "27s", role: "Master" }
+  { interval: "60s", timeout: "90s" },
+  { interval: "57s", timeout: "90s", role: "Master" }
 ]
 
 default[:rabbitmq][:hipe_compile] = false