Merge "Move L3 agent checks inside overcloud upgrade script."

tasks/upgrade/overcloud_upgrade_converge.yml

@@ -1,6 +1,4 @@
 ---
-- include: ../common/l3_agent_connectivity_check_start_script.yml
-
 - name: run major upgrade converge step
   shell: "bash {{ overcloud_upgrade_converge_script }} 2>&1 {{ timestamper_cmd }} > \
     {{ working_dir }}/overcloud_upgrade_converge.log"
@@ -18,5 +16,3 @@
     - name: was the overcloud upgrade converge successful.
       fail: msg="Overcloud upgrade converge step failed... :("
   when: overcloud_converge_upgrade.rc != 0
-
-- include: ../common/l3_agent_connectivity_check_stop_script.yml

templates/overcloud_upgrade_converge.sh.j2

@@ -3,9 +3,22 @@
 # Run major upgrade converge step on overcloud nodes
 #
 set -euo pipefail
+{% if l3_agent_connectivity_check|bool %}
+if [[ -e {{ working_dir }}/l3_agent_start_ping.sh ]]; then
+    source {{ overcloud_rc }}
+    bash {{ working_dir }}/l3_agent_start_ping.sh
+fi
+{% endif %}
+
+{% if l3_agent_failover_check|bool %}
+if [[ -e {{ working_dir }}/l3_agent_failover_pre.sh ]]; then
+    source {{ overcloud_rc }}
+    bash {{ working_dir }}/l3_agent_failover_pre.sh
+fi
+{% endif %}
 
 source {{ undercloud_rc }}
-echo "Running {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} major {% endif %}upgrade converge step"
+echo "[$(date)] Running {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} major {% endif %}upgrade converge step"
 openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrade {% endif %}converge \
     {% if ffu_overcloud_upgrade %}
         --yes \
@@ -43,3 +56,19 @@ openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgra
     {% endif %}
     {% endif %}
     {% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
+
+
+echo "[$(date)] Finished {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} major {% endif %}upgrade converge step"
+{% if l3_agent_connectivity_check|bool %}
+if [[ -e {{ working_dir }}/l3_agent_stop_ping.sh ]]; then
+    source {{ overcloud_rc }}
+    bash {{ working_dir }}/l3_agent_stop_ping.sh
+fi
+{% endif %}
+
+{% if l3_agent_failover_check|bool %}
+if [[ -e {{ working_dir }}/l3_agent_failover_post.sh ]]; then
+    source {{ overcloud_rc }}
+    bash {{ working_dir }}/l3_agent_failover_post.sh
+fi
+{% endif %}