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-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F49829%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>
(cherry picked from commmit a183db4b3404bd12073b5691eb5d4fbd8135b44b)
---

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 5de4673cc..346615952 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-ocata-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml
index cef2a8881..9068cc0ac 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_interface_vcp_triport.yml
@@ -19,11 +19,6 @@ parameters:
           type: eth
           proto: dhcp
           name: ${_param:dhcp_nic}
-          route:
-            mcpcontol:
-              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