openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove the os-net-config element config.json template 

On upgrade from environments earlier than Pike we should remove
this file as it can cause problems with post-upgrade reboots
see bug for more info.

Change-Id: If7f4bef3a79a881f003ee42f62fe51c537004e2a
Related-Bug: 1758161
(cherry picked from commit 55864c9e75)
(cherry picked from commit 2113bf3ae9)
This commit is contained in:
mandreou 2018-03-26 16:22:48 +03:00
parent c2f4a7d2ff
commit c5f6f704ac
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/major-upgrade-composable-steps-docker.yaml
View File

@ -10,5 +10,7 @@ parameter_defaults:
# Ocata to Pike, put any needed host-level workarounds here
yum update -y ansible
yum install -y ansible-pacemaker
# Remove the element os-net-config config.json https://bugs.launchpad.net/tripleo/+bug/1758161/
rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json || true
MigrationSshPort: 22
UpgradeRemoveUnusedPackages: false

2
environments/major-upgrade-composable-steps.yaml
View File

@ -15,5 +15,7 @@ parameter_defaults:
rm -f /usr/libexec/os-apply-config/templates/etc/puppet/hiera.yaml
rm -f /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles
rm -f /etc/puppet/hieradata/*.yaml
# Remove the element os-net-config config.json https://bugs.launchpad.net/tripleo/+bug/1758161/
rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json || true
MigrationSshPort: 22
UpgradeRemoveUnusedPackages: false