Merge "Remove puppet run and workarounds from tripleo_upgrade_node.sh" into stable/pike

1 files changed, 1 insertions, 45 deletions

diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh
index baf838e4..95de99be 100644
--- a/extraconfig/tasks/tripleo_upgrade_node.sh
+++ b/extraconfig/tasks/tripleo_upgrade_node.sh
@@ -26,52 +26,8 @@ fi
 DEBUG="true"
 SCRIPT_NAME=$(basename $0)
 $(declare -f log_debug)
-$(declare -f manage_systemd_service)
-$(declare -f systemctl_swift)
-$(declare -f special_case_ovs_upgrade_if_needed)
 
-# pin nova messaging +-1 for the nova-compute service
-if [[ -n \$NOVA_COMPUTE ]]; then
-    crudini  --set /etc/nova/nova.conf upgrade_levels compute auto
-fi
-
-special_case_ovs_upgrade_if_needed
-
-if [[ -n \$SWIFT_STORAGE ]]; then
-    systemctl_swift stop
-fi
-
-yum -y update
-
-if [[ -n \$SWIFT_STORAGE ]]; then
-    systemctl_swift start
-fi
-# Due to bug#1640177 we need to restart compute agent
-if [[ -n \$NOVA_COMPUTE ]]; then
-    log_debug "Restarting openstack ceilometer agent compute"
-    systemctl restart openstack-ceilometer-compute
-    yum install -y openstack-nova-migration
-    # https://bugs.launchpad.net/tripleo/+bug/1707926 stop&disable libvirtd
-    log_debug "Stop and disable libvirtd service for upgrade to containers"
-    systemctl stop libvirtd
-    systemctl disable libvirtd
-    log_debug "Stop and disable openstack-nova-compute for upgrade to containers"
-    systemctl stop openstack-nova-compute
-    systemctl disable openstack-nova-compute
-fi
-
-# Apply puppet manifest to converge just right after the ${ROLE} upgrade
-$(declare -f run_puppet)
-for step in 1 2 3 4 5 6; do
-    log_debug "Running puppet step \$step for ${ROLE}"
-    if ! run_puppet /root/${ROLE}_puppet_config.pp ${ROLE} \${step}; then
-         log_debug "Puppet failure at step \${step}"
-         exit 1
-    fi
-    log_debug "Completed puppet step \$step"
-done
-
-log_debug "TripleO upgrade run completed."
+log_debug "$UPGRADE_SCRIPT has completed - moving onto ansible playbooks"
 
 ENDOFCAT