[fdio] Make VIF timeout non-fatal

The first VMs spawned still exhibit the race condition described in
the ticket, so apply the same workaround proposed during the Fraser
release cycle in FDS.

JIRA: FDS-156

Change-Id: I3b2b1ed7b5711daf81b5f4a263e4dbee9f502259
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 527f953f6006e9934d0bba843018247a6764a35c)

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 825d9d5..d5f0145 100644 (file)
--- 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 0faf1b8..234cd37 100644 (file)
--- 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}