From 42559457874839dd9544433e4a5d30f298536896 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Mon, 19 Dec 2016 15:40:53 -0800
Subject: [PATCH] Fix newline issues

---
 common/templates/_endpoints.tpl         | 3 ++-
 common/values.yaml                      | 4 +++-
 horizon/templates/bin/_start.sh.tpl     | 3 ++-
 horizon/templates/etc/_horizon.conf.tpl | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/templates/_endpoints.tpl b/common/templates/_endpoints.tpl
index 90f591e4d8..0170b4eb5c 100644
--- a/common/templates/_endpoints.tpl
+++ b/common/templates/_endpoints.tpl
@@ -5,4 +5,5 @@
 {{- with .Values.endpoints.keystone -}}
 	{{.scheme}}://{{.hosts.internal | default .hosts.default}}:{{.port.public}}{{.path}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
diff --git a/common/values.yaml b/common/values.yaml
index 685d463e43..da62e63235 100644
--- a/common/values.yaml
+++ b/common/values.yaml
@@ -4,4 +4,6 @@
 # name: value
 
 global:
-  fqdn_suffix: cluster.local
+  region: cluster
+  tld: local
+
diff --git a/horizon/templates/bin/_start.sh.tpl b/horizon/templates/bin/_start.sh.tpl
index 0741d29f74..75c5f9eb17 100644
--- a/horizon/templates/bin/_start.sh.tpl
+++ b/horizon/templates/bin/_start.sh.tpl
@@ -14,4 +14,5 @@ rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
 # wsgi/horizon-http needs open files here, including secret_key_store
 chown -R horizon /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/
 
-apache2 -DFOREGROUND
\ No newline at end of file
+apache2 -DFOREGROUND
+
diff --git a/horizon/templates/etc/_horizon.conf.tpl b/horizon/templates/etc/_horizon.conf.tpl
index 74915f7ac9..aea2888f7a 100644
--- a/horizon/templates/etc/_horizon.conf.tpl
+++ b/horizon/templates/etc/_horizon.conf.tpl
@@ -19,4 +19,5 @@ Listen 0.0.0.0:{{ .Values.network.port}}
     <Location "/static">
         SetHandler None
     </Location>
-</Virtualhost>
\ No newline at end of file
+</Virtualhost>
+