Scott Moser has proposed merging ~smoser/cloud-init:cleanup/no-more-brickies.net into cloud-init:master.
Commit message: 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 Requested reviews: cloud-init commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/333350 -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:cleanup/no-more-brickies.net into cloud-init:master.
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..dbd012f 100644 --- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py +++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py @@ -8,7 +8,7 @@ class TestHostnameFqdn(base.CloudTestCase): """Test Hostname module.""" ex_hostname = "cloudinit1" - ex_fqdn = "cloudinit2.i9n.brickies.net" + ex_fqdn = "cloudinit2.i9n.cloud-init.io" 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..ebf2b32 100644 --- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml +++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml @@ -7,7 +7,7 @@ cloud_config: | #cloud-config manage_etc_hosts: true hostname: cloudinit1 - fqdn: cloudinit2.i9n.brickies.net + fqdn: cloudinit2.i9n.cloud-init.io collect_scripts: hosts: | #!/bin/bash
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
