From a183db4b3404bd12073b5691eb5d4fbd8135b44b Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 22 Dec 2017 17:53:36 +0400 Subject: [vcp] Catch 'no response' of salt minion as well Salt minion could return 'no response' and cause an unconfigured state of the vcp node(s), so catch this output after linux state as well. Also clean up excess route on proxy nodes. Change-Id: I3183fa09ff41a8f027ee789869bdae0c3962ab8f Signed-off-by: Michael Polenchuk --- .../baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml | 5 ----- mcp/reclass/classes/system | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'mcp/reclass/classes') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml index c81493e0f..9068cc0ac 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml @@ -19,11 +19,6 @@ parameters: type: eth proto: dhcp name: ${_param:dhcp_nic} - route: - mcpcontrol: - address: ${_param:opnfv_net_mcpcontrol} - netmask: ${_param:opnfv_net_mcpcontrol_mask} - gateway: ${_param:opnfv_infra_maas_node01_deploy_address} single_int: enabled: true type: eth diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 426fec4fa..86378e753 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 426fec4fa187be968eaf57374c956a361aa65411 +Subproject commit 86378e7534a28143478cbf010928b30bfef81afd -- cgit 1.2.3-korg