From 875367e1ba0d0cc659117f4e46f5d17ec033aeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Ab=C3=A9lard?= Date: Mon, 4 Aug 2014 14:27:46 +0200 Subject: [PATCH 1/2] Fixed a bug which appears when hostname contains a point (.) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: Antoine Abélard Date: Mon Aug 04 14:29:00 2014 +0100 With the current implementation, the OpenShift Origin deployment fails when there is point (.) in the hostname. This new implementation fix this bug. --- templates/named/dynamic-zone.db.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/named/dynamic-zone.db.erb b/templates/named/dynamic-zone.db.erb index fb12ccc4..6313d0c6 100644 --- a/templates/named/dynamic-zone.db.erb +++ b/templates/named/dynamic-zone.db.erb @@ -10,5 +10,6 @@ $TTL 1800 NS <%= scope.lookupvar('::openshift_origin::nameserver_hostname') %>. $ORIGIN <%= scope.lookupvar('::openshift_origin::domain') %>. <% if scope.lookupvar('::openshift_origin::nameserver_hostname').end_with?(scope.lookupvar('::openshift_origin::domain')) %> -<%= scope.lookupvar('::openshift_origin::nameserver_hostname').split('.').first %> A <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %> +<%= scope.lookupvar('::openshift_origin::nameserver_hostname').gsub('.'+scope.lookupvar('::openshift_origin::domain'),'') %> A <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %> <% end %> + From 9a0ae164b008136a8571e600fa303e98058ca481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Ab=C3=A9lard?= Date: Tue, 5 Aug 2014 15:56:16 +0200 Subject: [PATCH 2/2] Simpler implementation proposed by ekohl --- templates/named/dynamic-zone.db.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/named/dynamic-zone.db.erb b/templates/named/dynamic-zone.db.erb index 6313d0c6..f7b9cc73 100644 --- a/templates/named/dynamic-zone.db.erb +++ b/templates/named/dynamic-zone.db.erb @@ -10,6 +10,6 @@ $TTL 1800 NS <%= scope.lookupvar('::openshift_origin::nameserver_hostname') %>. $ORIGIN <%= scope.lookupvar('::openshift_origin::domain') %>. <% if scope.lookupvar('::openshift_origin::nameserver_hostname').end_with?(scope.lookupvar('::openshift_origin::domain')) %> -<%= scope.lookupvar('::openshift_origin::nameserver_hostname').gsub('.'+scope.lookupvar('::openshift_origin::domain'),'') %> A <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %> +<%= scope.lookupvar('::openshift_origin::nameserver_hostname') %>. A <%= scope.lookupvar('::openshift_origin::nameserver_ip_addr') %> <% end %>