From 527f953f6006e9934d0bba843018247a6764a35c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 24 Jan 2019 01:25:17 +0100 Subject: [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 --- mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 | 5 +++++ mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'mcp/reclass') 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} -- cgit 1.2.3-korg