aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-24 10:53:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-24 10:53:27 +0000
commit380837866a796d44e804d59408a3ae97ba4696ef (patch)
tree8358c052bf6879b839fc1e6a26b75d955cd5de12
parent689ca642765365ea41e603684c679cad5a830476 (diff)
parent527f953f6006e9934d0bba843018247a6764a35c (diff)
Merge "[fdio] Make VIF timeout non-fatal"
-rw-r--r--mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j25
-rw-r--r--mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
index 825d9d550..d5f0145b7 100644
--- a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2
@@ -13,6 +13,11 @@ classes:
- cluster.mcp-common-noha.openstack_compute
- cluster.mcp-fdio-noha
parameters:
+ nova:
+ compute:
+ # yamllint disable-line rule:truthy
+ vif_plugging_is_fatal: False
+ vif_plugging_timeout: 0
neutron:
compute:
backend:
diff --git a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
index 0faf1b86a..234cd3733 100644
--- a/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml
@@ -29,6 +29,11 @@ parameters:
internal_protocol: 'http'
neutron_firewall_driver: 'iptables_hybrid'
openstack_node_role: primary
+ nova:
+ controller:
+ # yamllint disable-line rule:truthy
+ vif_plugging_is_fatal: False
+ vif_plugging_timeout: 0
neutron:
server:
role: ${_param:openstack_node_role}