X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fhosts-config.sh;h=b3109a0c9be9f9a3413c9c12b6c6b6a4c5ffe531;hb=ec58a4b6c5955736ec20b03496f03b281d6720ef;hp=4826d6150a93ff65a8cb42e13ff750d8ca4fdfe4;hpb=a23ad11958ac23b042facedd4dde9281c4a353fd;p=apex-tripleo-heat-templates.git

diff --git a/scripts/hosts-config.sh b/scripts/hosts-config.sh
index 4826d615..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"
@@ -30,17 +32,9 @@ write_entries() {
 }
 
 if [ ! -z "$hosts" ]; then
-    # cloud-init files are /etc/cloud/templates/hosts.OSNAME.tmpl
-    DIST=$(lsb_release -is | tr -s [A-Z] [a-z])
-    case $DIST in
-        fedora|redhatenterpriseserver)
-            name="redhat"
-            ;;
-        *)
-            name="$DIST"
-            ;;
-    esac
-    write_entries "/etc/cloud/templates/hosts.${name}.tmpl" "$hosts"
+    for tmpl in /etc/cloud/templates/hosts.*.tmpl ; do
+        write_entries "$tmpl" "$hosts"
+    done
     write_entries "/etc/hosts" "$hosts"
 else
     echo "No hosts in Heat, nothing written."