From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 22 Dec 2017 13:53:36 +0000 (+0400)
Subject: [vcp] Catch 'no response' of salt minion as well
X-Git-Tag: opnfv-6.0.0~188
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F49557%2F1;p=fuel.git

[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 <mpolenchuk@mirantis.com>
---

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 3856bef10..cabe44aa7 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -52,7 +52,7 @@ done
 wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
 wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
 wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \
-  "tee /dev/stderr | grep -Fq 'Not connected'"
+  "tee /dev/stderr | grep -Eq '(Not connected|No response)'"
 
 wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
   $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
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