summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-22 17:53:36 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-22 18:09:46 +0400
commita183db4b3404bd12073b5691eb5d4fbd8135b44b (patch)
tree926a72a315872c52e28ae2b9ce661b5b94930848 /mcp
parent5c56cbad4b65d69ec0b23042ee194e30d1234200 (diff)
[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>
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/virtual_control_plane2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml5
m---------mcp/reclass/classes/system0
3 files changed, 1 insertions, 6 deletions
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
-Subproject 426fec4fa187be968eaf57374c956a361aa6541
+Subproject 86378e7534a28143478cbf010928b30bfef81af