This change restores the PreNetworkConfig resources, so that we migrate
back ExtraCnfigPre and NodeExtraConfig from pre network configurations
to post network configurations, to be consistent with older version
depending on Heat software deployments instead of config download.
Conflicts: common/deploy-steps.j2
Depends-on: https://review.opendev.org/786901
Closes-Bug: #1907214
Change-Id: I96e7e4c570839cfba6011788464d8e93925b2f01
(cherry picked from commit e7894c0b2308692364b72a7dc22cb5a32cd5c3b8)
(cherry picked from commit 87fc83d7b1334dd2bd5852ae9edf44f87d29e79c)
Reviewed: https:/ /review. opendev. org/c/openstack /tripleo- heat-templates/ +/786891 /opendev. org/openstack/ tripleo- heat-templates/ commit/ ef575f87f51686a 9c65a1a33d49331 91c052a5e0
Committed: https:/
Submitter: "Zuul (22348)"
Branch: stable/ussuri
commit ef575f87f51686a 9c65a1a33d49331 91c052a5e0
Author: Takashi Kajinami <email address hidden>
Date: Mon Jan 25 19:57:02 2021 +0900
Restore PreNetworkConfig resources
This change restores the PreNetworkConfig resources, so that we migrate
back ExtraCnfigPre and NodeExtraConfig from pre network configurations
to post network configurations, to be consistent with older version
depending on Heat software deployments instead of config download.
Conflicts:
common/ deploy- steps.j2
Depends-on: https:/ /review. opendev. org/786901 fba6011788464d8 e93925b2f01 364b72a7dc22cb5 a32cd5c3b8) 2bd5852ae9edf44 f87d29e79c)
Closes-Bug: #1907214
Change-Id: I96e7e4c570839c
(cherry picked from commit e7894c0b2308692
(cherry picked from commit 87fc83d7b1334dd