diff options
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml | 5 | ||||
| m--------- | mcp/reclass/classes/system | 0 |
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 |