openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Avoid awk error in hosts-config.sh for large deployments 

This ports the fixes made to the legacy 51-hosts script, which this
script is derived from, to tht.

See related t-i-e patch Ibe0a9f6ec10d55750e3b0e16301236141f988d69

Change-Id: Ide922af93a5d185bd592e220327326f1d244c4e2
Closes-Bug: #1674732
This commit is contained in:
Steven Hardy 2017-04-07 10:50:39 +01:00
parent 8897a23aa1
commit 92b238ea17
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/hosts-config.sh
View File

@ -13,14 +13,16 @@ write_entries() {
if grep -q "^# HEAT_HOSTS_START" "$file"; then if grep -q "^# HEAT_HOSTS_START" "$file"; then
temp=$(mktemp) temp=$(mktemp)
awk -v v="$entries" '/^# HEAT_HOSTS_START/ { (
print $0 sed '/^# HEAT_HOSTS_START/,$d' "$file"
print v echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n"
f=1 echo "$entries"
}f &&!/^# HEAT_HOSTS_END$/{next}/^# HEAT_HOSTS_END$/{f=0}!f' "$file" > "$temp" echo -ne "# HEAT_HOSTS_END\n\n"
echo "INFO: Updating hosts file $file, check below for changes" sed '1,/^# HEAT_HOSTS_END/d' "$file"
diff "$file" "$temp" || true ) > "$temp"
cat "$temp" > "$file" echo "INFO: Updating hosts file $file, check below for changes"
diff "$file" "$temp" || true
cat "$temp" > "$file"
else else
echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n" >> "$file" echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n" >> "$file"
echo "$entries" >> "$file" echo "$entries" >> "$file"