openstack/tripleo-heat-templates
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-04-07 22:36:25 +00:00 committed by Gerrit Code Review
commit 2bc62ed305
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"