aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml2
5 files changed, 9 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index 93acf13e8..0416d26db 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -72,10 +72,13 @@ parameters:
gateway:
vlan_aware_vms: true
root_helper_daemon: false
+ dhcp_lease_duration: 3600
+ report_interval: 120
nova:
compute:
disk_cachemodes: file=directsync,block=none
preallocate_images: space
+ heal_instance_info_cache_interval: 300
barbican:
enabled: ${_param:barbican_integration_enabled}
image:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 0770f5c45..9cb54da7e 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -87,6 +87,7 @@ parameters:
<<: *db_conn_recycle_time
vlan_aware_vms: true
root_helper_daemon: false
+ agent_down_time: 300
global_physnet_mtu: ${_param:interface_mtu}
backend:
external_mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 41841c922..15418c71e 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -27,6 +27,7 @@ parameters:
libvirt_bin: /etc/default/libvirtd
disk_cachemodes: file=directsync,block=none
vncproxy_url: http://${_param:cluster_vip_address}:6080
+ heal_instance_info_cache_interval: 300
bind:
vnc_address: ${_param:single_address}
network:
@@ -43,6 +44,7 @@ parameters:
notification: true
vlan_aware_vms: true
root_helper_daemon: false
+ report_interval: 120
agent_mode: ${_param:neutron_compute_agent_mode}
message_queue:
host: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index d36d5830a..cdbb20138 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -184,6 +184,7 @@ parameters:
server:
vlan_aware_vms: true
root_helper_daemon: false
+ agent_down_time: 300
global_physnet_mtu: ${_param:interface_mtu}
backend:
external_mtu: ${_param:interface_mtu}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index 499749d82..5d9c62a7e 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -18,3 +18,5 @@ parameters:
agent_mode: ${_param:neutron_gateway_agent_mode}
vlan_aware_vms: true
root_helper_daemon: false
+ dhcp_lease_duration: 3600
+ report_interval: 120