Enhance completion message when upgrading non controller nodes

[Carlos Camacho]

Description
===========

Upgrading non-controller nodes in the Overcloud don't display the process completion after the upgrade finishes completely.

Only present when displaying the debug view (defaulted to DEBUG=true).

Steps to reproduce
==================

Environment:
openstack-puppet-modules-10.0.0-1.el7ost.noarch
instack-undercloud-6.0.0-6.el7ost.noarch
openstack-tripleo-heat-templates-6.0.0-7.el7ost.noarch
[stack@director ~]$

As part of upgrade try to run:
upgrade-non-controller.sh --upgrade overcloud-compute-0

Result:

Notice: Compiled catalog for overcloud-compute-2.cwdg720xd01.org in environment production in 3.72 seconds
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Neutron_agent_ovs[securitygroup/firewall_driver]/value: value changed 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' to 'iptables_hybrid'
Notice: /Stage[main]/Nova::Compute::Libvirt/Nova_config[libvirt/enabled_perf_events]/ensure: created
Notice: /Stage[main]/Nova::Deps/Anchor[nova::config::end]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Nova::Deps/Anchor[nova::service::begin]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Nova::Compute/Nova::Generic_service[compute]/Service[nova-compute]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Nova::Deps/Anchor[nova::service::end]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Tripleo::Profile::Base::Kernel/Kmod::Load[ip_conntrack_proto_sctp]/Exec[modprobe ip_conntrack_proto_sctp]/returns: executed successfully
Notice: /Stage[main]/Neutron::Deps/Anchor[neutron::config::end]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Neutron::Deps/Anchor[neutron::service::begin]: Triggered 'refresh' from 1 events
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Service[neutron-ovs-agent-service]/ensure: ensure changed 'stopped' to 'running'
Notice: /Stage[main]/Neutron::Deps/Anchor[neutron::service::end]: Triggered 'refresh' from 1 events
Notice: Applied catalog in 8.47 seconds
puppet apply exited with exit code 2
+ rc=2
+ echo 'puppet apply exited with exit code 2'
+ set -e
+ '[' 2 -eq 2 -o 2 -eq 0 ']'
+ set +xu
Wed Apr 26 21:31:30 UTC 2017 280d795a-8e43-41a5-826a-394c54b9fb49 tripleo-upgrade overcloud-compute-2 Completed puppet step 5
Wed Apr 26 21:31:30 UTC 2017 280d795a-8e43-41a5-826a-394c54b9fb49 tripleo-upgrade overcloud-compute-2 Running puppet step 6 for Compute
+ local manifest=/root/Compute_puppet_config.pp
+ local role=Compute
+ local step=6
+ local rc=0
+ export FACTER_deploy_config_name=ComputeDeployment_Step6
+ FACTER_deploy_config_name=ComputeDeployment_Step6
+ '[' -e /etc/puppet/hieradata/heat_config_ComputeDeployment_Step6.json ']'
+ echo 'Step6 doesn'\''t exist for Compute'
Step6 doesn't exist for Compute
+ set -e
+ '[' 0 -eq 2 -o 0 -eq 0 ']'
+ set +xu
Wed Apr 26 21:31:30 UTC 2017 280d795a-8e43-41a5-826a-394c54b9fb49 tripleo-upgrade overcloud-compute-2 Completed puppet step 6
Wed Apr 26 21:31:30 UTC 2017 280d795a-8e43-41a5-826a-394c54b9fb49 tripleo-upgrade overcloud-compute-2 TripleO upgrade run completed.

Expected result: more emphasis on successful run as non 0 return from puppet apply may confuse users (despite the fact that exit code 2 means : The run succeeded, and some resources were changed)

[Carlos Camacho (ccamacho)]

Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1445955

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/482868

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/482868
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=7bf4edde5de2ab99824c9e8259a9ffa3307b9554
Submitter: Zuul
Branch: master

commit 7bf4edde5de2ab99824c9e8259a9ffa3307b9554
Author: Carlos Camacho <email address hidden>
Date: Wed Jul 12 11:26:14 2017 +0200

    Enhance completion message when upgrading non controller nodes

    This adds a better completion message when upgrading a non
    controller node.

    Change-Id: I1cd765b1998f059702f0c17ccb67d54f6d5db362
    Closes-Bug: 1703792

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.0.0b3 development milestone.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/569793

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/569794

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/569793
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4a7aa0c37c83d9a6259cf5ccad674aa24a4ad5bf
Submitter: Zuul
Branch: stable/pike

commit 4a7aa0c37c83d9a6259cf5ccad674aa24a4ad5bf
Author: Carlos Camacho <email address hidden>
Date: Wed Jul 12 11:26:14 2017 +0200

    Enhance completion message when upgrading non controller nodes

    This adds a better completion message when upgrading a non
    controller node.

    Change-Id: I1cd765b1998f059702f0c17ccb67d54f6d5db362
    Closes-Bug: 1703792
    (cherry picked from commit 7bf4edde5de2ab99824c9e8259a9ffa3307b9554)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/569794
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=f1b5697f0a73a59752031359752f14e4eddd4bdf
Submitter: Zuul
Branch: stable/ocata

commit f1b5697f0a73a59752031359752f14e4eddd4bdf
Author: Carlos Camacho <email address hidden>
Date: Wed Jul 12 11:26:14 2017 +0200

    Enhance completion message when upgrading non controller nodes

    This adds a better completion message when upgrading a non
    controller node.

    Change-Id: I1cd765b1998f059702f0c17ccb67d54f6d5db362
    Closes-Bug: 1703792
    (cherry picked from commit 7bf4edde5de2ab99824c9e8259a9ffa3307b9554)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.13 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 6.2.15 release.