diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-24 19:50:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-24 19:50:23 +0000 |
| commit | ed77692b5d2515966559ba1cd3597641fa1b70d6 (patch) | |
| tree | c2d8aed6c63a4e93f046ce82d2e842b4b818efaf | |
| parent | c124749178d23ca8de262f048bdef08d9689abcf (diff) | |
| parent | fb634f8602fb18407c5a34a37a6cc8c16200a8ec (diff) | |
Merge "[fdio] Make VIF timeout non-fatal" into stable/gambia
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 | 5 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml | 5 |
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} |