Allow the following parameters to be configured in the cluster model
agent_down_time
dhcp_agents_per_network
allow_automatic_dhcp_failover
rpc_conn_pool_size
rpc_thread_pool_size
rpc_response_timeout
report_interval
oslo_messaging change for Queens here:
http://gerrit.mcp.mirantis.com/33457
Change-Id: Ica83263681fca1e28121f84e5ddd2d2259149359
Related-Prod: PROD-26334
Related-Prod: PROD-26314
diff --git a/tests/pillar/compute_dvr.sls b/tests/pillar/compute_dvr.sls
index 24ab218..4071003 100644
--- a/tests/pillar/compute_dvr.sls
+++ b/tests/pillar/compute_dvr.sls
@@ -3,6 +3,7 @@
base_mac: fa:16:3f:00:00:00
dvr_base_mac: fa:16:3f:a0:00:00
agent_mode: dvr
+ report_interval: 10
backend:
engine: ml2
tenant_network_types: "flat,vxlan"
@@ -20,6 +21,9 @@
port: 5672
user: openstack
virtual_host: /openstack
+ rpc_conn_pool_size: 300
+ rpc_thread_pool_size: 2048
+ rpc_response_timeout: 3600
metadata:
host: 127.0.0.1
password: password
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 964f3bd..e8cf760 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -10,6 +10,9 @@
rpc_workers: 2
dhcp_lease_duration: 86400
agent_boot_time: 900
+ agent_down_time: 30
+ dhcp_agents_per_network: 3
+ allow_automatic_dhcp_failover: false
backend:
engine: contrail
#contrail_discovery_host
@@ -47,6 +50,9 @@
user: openstack
password: password
virtual_host: '/openstack'
+ rpc_conn_pool_size: 300
+ rpc_thread_pool_size: 2048
+ rpc_response_timeout: 3600
compute:
host: 127.0.0.1
region: RegionOne
diff --git a/tests/pillar/gateway_dvr.sls b/tests/pillar/gateway_dvr.sls
index 2751c75..4c1dae4 100644
--- a/tests/pillar/gateway_dvr.sls
+++ b/tests/pillar/gateway_dvr.sls
@@ -3,6 +3,7 @@
base_mac: fa:16:3f:00:00:00
dvr_base_mac: fa:16:3f:a0:00:00
agent_mode: dvr_snat
+ report_interval: 10
backend:
engine: ml2
tenant_network_types: "flat,vxlan"
@@ -20,6 +21,9 @@
port: 5672
user: openstack
virtual_host: /openstack
+ rpc_conn_pool_size: 300
+ rpc_thread_pool_size: 2048
+ rpc_response_timeout: 3600
metadata:
host: 127.0.0.1
password: password