summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-31 16:34:28 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-04 12:25:32 +0400
commitb6af3b0d327e54bdd843ca09ccd4952945b00d4a (patch)
treeaa9ca5a57a47b654501a29b669531378e6944958 /mcp/reclass/classes
parentc2ea7deba73e335ace30eba1db7e2f80d3c1daed (diff)
[odl/noha] Make vif_plugging non-fatal
In order to mitigate live migration procedure make VIF plugging event non-fatal for nova-compute. Also align max value of memory for instance of ODL controller. Change-Id: I0d00cc97c652eef3bd3404fac4715e2e7f2f02c7 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j24
2 files changed, 6 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 78263489c..4063754e0 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -19,8 +19,8 @@ parameters:
server:
odl_bind_ip: ${_param:single_address}
odl_rest_port: ${_param:opendaylight_rest_port}
- java_min_mem: 3g
- java_max_mem: 3g
+ java_min_mem: 4g
+ java_max_mem: 4g
router_enabled: true
netvirt_nat_mode: conntrack
karaf_features:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index 969c9347f..863f24def 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -19,6 +19,10 @@ classes:
- cluster.mcp-common-noha.openstack_compute
- cluster.mcp-odl-noha
parameters:
+ nova:
+ compute:
+ vif_plugging_is_fatal: false
+ vif_plugging_timeout: 60
linux:
network:
ovs_nowait: false