From ff0579ad5cd8e1eb79213ba211c51f4801b73e97 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 15 May 2018 18:11:48 +0000
Subject: [PATCH] Add zuulci.org typo domain

In an effort to thwart egregious typosquatting, host a zuulci.org
domain which will serve as an alias for the canonical zuul-ci.org.

Change-Id: If878ab310acd513d981fd37e954b0abeb7a7ed76
Depends-On: https://review.openstack.org/568661
---
 manifests/site.pp                                        | 2 +-
 modules/openstack_project/manifests/master_nameserver.pp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index bb23ac32cd..5e5bd06be2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -928,7 +928,7 @@ node /^ns\d+\.openstack\.org$/ {
       'adns1_zones' => {
         allow_notify => dns_a('adns1.openstack.org'),
         masters => dns_a('adns1.openstack.org'),
-        zones => ['zuul-ci.org'],
+        zones => ['zuul-ci.org', 'zuulci.org'],
         tsig_name => $tsig_name,
       }
     }
diff --git a/modules/openstack_project/manifests/master_nameserver.pp b/modules/openstack_project/manifests/master_nameserver.pp
index 4a6072b1af..cb2ca0ccac 100644
--- a/modules/openstack_project/manifests/master_nameserver.pp
+++ b/modules/openstack_project/manifests/master_nameserver.pp
@@ -116,6 +116,10 @@ class openstack_project::master_nameserver (
     source  => 'file:///opt/zone-zuul-ci.org/zones/zuul-ci.org',
     require => Vcsrepo['/opt/zone-zuul-ci.org'],
   }
+  openstack_project::master_zone { 'zuulci.org':
+    source  => 'file:///opt/zone-zuul-ci.org/zones/zuulci.org',
+    require => Vcsrepo['/opt/zone-zuul-ci.org'],
+  }
 
   exec { 'rndc_reload' :
     command     => 'rndc reload',