Merge pull request #955 from openshift-cherrypick-robot/cherry-pick-9…

…52-to-v1.3.x [v1.3.x] Fix override of rendered files via tarball
openstack-k8s-operators · Nov 28, 2023 · 570854c · 570854c
2 parents 8f27ab9 + 030ef2b
commit 570854c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/openstackconfiggenerator/bin/create-playbooks.sh b/templates/openstackconfiggenerator/bin/create-playbooks.sh
@@ -38,14 +38,14 @@ cp -a /usr/share/openstack-tripleo-heat-templates/* $TEMPLATES_DIR
 rm -Rf $HOME/config-tmp
 mkdir -p $HOME/config-tmp
 pushd $HOME/config-tmp
+cp $HOME/config/* $HOME/config-tmp
+cp $HOME/config-custom/* $HOME/config-tmp
 # extract any tar files into $HOME/config-tmp
 {{- if .TripleoTarballFiles }}
 {{- range $key, $value := .TripleoTarballFiles }}
 tar -xvf $HOME/tht-tars/{{ $key }}
 {{- end }}
 {{- end }}
-cp $HOME/config/* $HOME/config-tmp
-cp $HOME/config-custom/* $HOME/config-tmp
 # remove all references to the default tht dir
 sed -e "s|/usr/share/openstack\-tripleo\-heat\-templates|\.|" -i $HOME/config-tmp/*.yaml
 # copy to our temp t-h-t dir