Merge ~smoser/cloud-init:cleanup/no-more-brickies.net into cloud-init:master

[Scott Moser]

Replace the temporary i9n.brickies.net with i9n.cloud-init.io.

We had used some dns records in i9n.brickies.net (my personal domain)
as a temporary solution until we got names registered in the cloud-init.io
namespace.

We now have CNAME records for:
  ubuntu.i9n.cloud-init.io
  cloudinit1.cloud-init.io
  cloudinit2.cloud-init.io

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:693d721c848611589e99f8261c9c1009091934f5
https://jenkins.ubuntu.com/server/job/cloud-init-ci/476/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/476/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:693d721c848611589e99f8261c9c1009091934f5
https://jenkins.ubuntu.com/server/job/cloud-init-ci/478/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/478/rebuild

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

+1 validated nslookup is returning out expected 127.0.1.1 now.

review: Approve

[Ryan Harper (raharper)]

review: Approve

diff --git a/tests/cloud_tests/instances/nocloudkvm.py b/tests/cloud_tests/instances/nocloudkvm.py
index 2427c85..cc82580 100644
--- a/tests/cloud_tests/instances/nocloudkvm.py
+++ b/tests/cloud_tests/instances/nocloudkvm.py
@@ -15,10 +15,8 @@ from tests.cloud_tests import util
 # This domain contains reverse lookups for hostnames that are used.
 # The primary reason is so sudo will return quickly when it attempts
 # to look up the hostname.  i9n is just short for 'integration'.
-# use i9n.brickies.net until i9n.cloud-init.io is populated:
-#   https://portal.admin.canonical.com/107125
 # see also bug 1730744 for why we had to do this.
-CI_DOMAIN = "i9n.brickies.net"
+CI_DOMAIN = "i9n.cloud-init.io"
 
 
 class NoCloudKVMInstance(base.Instance):
diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py
index 08ceae0..eb6f065 100644
--- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py
+++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py
@@ -1,6 +1,7 @@
 # This file is part of cloud-init. See LICENSE file for license information.
 
 """cloud-init Integration Test Verify Script."""
+from tests.cloud_tests.instances.nocloudkvm import CI_DOMAIN
 from tests.cloud_tests.testcases import base
 
 
@@ -8,7 +9,7 @@ class TestHostnameFqdn(base.CloudTestCase):
     """Test Hostname module."""
 
     ex_hostname = "cloudinit1"
-    ex_fqdn = "cloudinit2.i9n.brickies.net"
+    ex_fqdn = "cloudinit2." + CI_DOMAIN
 
     def test_hostname(self):
         """Test hostname output."""
diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml
index 5320ac5..a85ee79 100644
--- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml
+++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml
@@ -7,7 +7,8 @@ cloud_config: |
   #cloud-config
   manage_etc_hosts: true
   hostname: cloudinit1
-  fqdn: cloudinit2.i9n.brickies.net
+  # this needs changing if CI_DOMAIN were updated.
+  fqdn: cloudinit2.i9n.cloud-init.io
 collect_scripts:
   hosts: |
     #!/bin/bash