Ocata -> Pike upgrade fails on environments without network isolation

[Marius Cornea]

https://review.openstack.org/#/c/510577/ introduced running 'os-net-config --no-activate -c /etc/os-net-config/config.json -v --detailed-exit-codes' during overcloud upgrade.

In case of environments without network isolation enabled /etc/os-net-config/config.json doesn't exist so os-net-config fails.

Please see:
http://logs.openstack.org/25/500625/20/check/legacy-tripleo-ci-centos-7-scenario002-multinode-oooq-container-upgrades/62e7f14/logs/undercloud/home/zuul/overcloud_upgrade_console.log.txt.gz#_2017-11-04_00_14_17

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/517905
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=48aa4ff0045af91dd7bec11ef10f543e784e4c0a
Submitter: Zuul
Branch: master

commit 48aa4ff0045af91dd7bec11ef10f543e784e4c0a
Author: Sofer Athlan-Guyot <email address hidden>
Date: Mon Nov 6 11:22:54 2017 +0100

    Add condition to os-net-config run during upgrade.

    This add two conditionals:
     - first check that os-net-config needs upgrade
     - second verify that the configuration file exist and non empty.

    This prevent unnecessary run of os-net-config and error in certain
    network configuration.

    Change-Id: Ic905f7ed7e7fc9018bc494f77811392045fddfe8
    Closes-Bug: #1730328

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/521620
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=0a001b66726c913f1efea0ef32d3cb880f049007
Submitter: Zuul
Branch: master

commit 0a001b66726c913f1efea0ef32d3cb880f049007
Author: Mike Bayer <email address hidden>
Date: Mon Nov 20 13:08:17 2017 -0500

    Correct ignore_error -> ignore_errors

    In Ic905f7ed7e7fc9018bc494f77811392045fddfe8, the
    addition of logic to confirm os-net-config needs to be run relies
    upon the shell command being able to fail. This patch corrects
    the Ansible directive "ignore_errors" to be properly stated.

    Change-Id: Ie0efdce47dc11f05c436fbacaca6ec22cbe33ca1
    Closes-Bug: #1730328

[OpenStack Infra (hudson-openstack)]

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

commit 0ded9bc2c45c5ee3457d5339297dd1c24b10899d
Author: Sofer Athlan-Guyot <email address hidden>
Date: Mon Nov 6 11:22:54 2017 +0100

    Add condition to os-net-config run during upgrade.

    This add two conditionals:
     - first check that os-net-config needs upgrade
     - second verify that the configuration file exist and non empty.

    This prevent unnecessary run of os-net-config and error in certain
    network configuration.

    NOTE (zzzeek): the original cherry-pick has a typo which is corrected
    local to this patch; the master will be updated in a separate
    gerrit.

    Change-Id: Ic905f7ed7e7fc9018bc494f77811392045fddfe8
    Closes-Bug: #1730328
    (cherry picked from commit 48aa4ff0045af91dd7bec11ef10f543e784e4c0a)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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