summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-05 07:34:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-02-05 07:34:08 +0000
commit32d3a5bbf288a4e45f32a29610e49d856a48434f (patch)
treef926ec3e5d82e34f27b7379f2f5f585544a77a1a /mcp/reclass/classes
parentad2d9696a3a9dd7602dd0d794a0b722e0b9d3565 (diff)
parentb6af3b0d327e54bdd843ca09ccd4952945b00d4a (diff)
Merge "[odl/noha] Make vif_plugging non-fatal"
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