summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-07 22:36:25 +0000
committerGerrit Code Review <review@openstack.org>2017-04-07 22:36:25 +0000
commit2bc62ed305f73ca06e37559819edc6498446a1a0 (patch)
tree4be985810ab2030ee45f9989d098aedeb425f011 /scripts
parenta190acfa7d802a27df9a922ed391367d35addf64 (diff)
parent92b238ea1739340746d93baa73a791c61c3a5e6c (diff)
Merge "Avoid awk error in hosts-config.sh for large deployments"
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/hosts-config.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/hosts-config.sh b/scripts/hosts-config.sh
index f456b316..b3109a0c 100755
--- a/scripts/hosts-config.sh
+++ b/scripts/hosts-config.sh
@@ -13,14 +13,16 @@ write_entries() {
if grep -q "^# HEAT_HOSTS_START" "$file"; then
temp=$(mktemp)
- awk -v v="$entries" '/^# HEAT_HOSTS_START/ {
- print $0
- print v
- f=1
- }f &&!/^# HEAT_HOSTS_END$/{next}/^# HEAT_HOSTS_END$/{f=0}!f' "$file" > "$temp"
- echo "INFO: Updating hosts file $file, check below for changes"
- diff "$file" "$temp" || true
- cat "$temp" > "$file"
+ (
+ sed '/^# HEAT_HOSTS_START/,$d' "$file"
+ echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n"
+ echo "$entries"
+ echo -ne "# HEAT_HOSTS_END\n\n"
+ sed '1,/^# HEAT_HOSTS_END/d' "$file"
+ ) > "$temp"
+ echo "INFO: Updating hosts file $file, check below for changes"
+ diff "$file" "$temp" || true
+ cat "$temp" > "$file"
else
echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n" >> "$file"
echo "$entries" >> "$file"