cloud-init-dev team mailing list archive

[Jon Grimm <jon.grimm@xxxxxxxxxxxxx>]

Jon Grimm has proposed merging ~jgrimm/cloud-init:fix_tiny_url into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1669727 in cloud-init: "Mystery link in rhel.py"
  https://bugs.launchpad.net/cloud-init/+bug/1669727

For more details, see:
https://code.launchpad.net/~jgrimm/cloud-init/+git/cloud-init/+merge/321744

Remove/fix URL shortened references. 

Uses '# noqa' to allow >80 char length lines for long URLs if needed. 
-- 
Your team cloud init development team is requested to review the proposed merge of ~jgrimm/cloud-init:fix_tiny_url into cloud-init:master.

diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
index ef8535e..a04e1b2 100644
--- a/cloudinit/config/cc_yum_add_repo.py
+++ b/cloudinit/config/cc_yum_add_repo.py
@@ -52,7 +52,7 @@ def _format_repo_value(val):
         return str(int(val))
     if isinstance(val, (list, tuple)):
         # Can handle 'lists' in certain cases
-        # See: http://bit.ly/Qqrf1t
+        # See: https://linux.die.net/man/5/yum.conf
         return "\n    ".join([_format_repo_value(v) for v in val])
     if not isinstance(val, six.string_types):
         return str(val)
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 3f0f9d5..16f8d95 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -143,8 +143,7 @@ class Distro(distros.Distro):
             pkgs = []
 
         e = os.environ.copy()
-        # See: http://tiny.cc/kg91fw
-        # Or: http://tiny.cc/mh91fw
+        # See: http://manpages.ubuntu.com/manpages/xenial/man7/debconf.7.html
         e['DEBIAN_FRONTEND'] = 'noninteractive'
 
         wcfg = self.get_option("apt_get_wrapper", APT_GET_WRAPPER)
diff --git a/cloudinit/distros/parsers/hosts.py b/cloudinit/distros/parsers/hosts.py
index 87f164b..6444458 100644
--- a/cloudinit/distros/parsers/hosts.py
+++ b/cloudinit/distros/parsers/hosts.py
@@ -10,8 +10,8 @@ from cloudinit.distros.parsers import chop_comment
 
 
 # See: man hosts
-# or http://unixhelp.ed.ac.uk/CGI/man-cgi?hosts
-# or http://tinyurl.com/6lmox3
+# or https://linux.die.net/man/5/hosts
+# or https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-configfiles.html # noqa
 class HostsConf(object):
     def __init__(self, text):
         self._text = text
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 372c7d0..1fecb61 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -28,7 +28,7 @@ def _make_sysconfig_bool(val):
 
 
 class Distro(distros.Distro):
-    # See: http://tiny.cc/6r99fw
+    # See: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Networking_Guide/sec-Network_Configuration_Using_sysconfig_Files.html # noqa
     clock_conf_fn = "/etc/sysconfig/clock"
     locale_conf_fn = '/etc/sysconfig/i18n'
     systemd_locale_conf_fn = '/etc/locale.conf'
@@ -130,8 +130,8 @@ class Distro(distros.Distro):
             rhel_util.update_sysconfig_file(out_fn, host_cfg)
 
     def _select_hostname(self, hostname, fqdn):
-        # See: http://bit.ly/TwitgL
         # Should be fqdn if we can use it
+        # See: https://www.centos.org/docs/5/html/Deployment_Guide-en-US/ch-sysconfig.html#s2-sysconfig-network # noqa
         if fqdn:
             return fqdn
         return hostname
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
index b0ab275..ceef028 100644
--- a/cloudinit/sources/DataSourceCloudStack.py
+++ b/cloudinit/sources/DataSourceCloudStack.py
@@ -207,8 +207,8 @@ def get_latest_lease():
 
 def get_vr_address():
     # Get the address of the virtual router via dhcp leases
-    # see http://bit.ly/T76eKC for documentation on the virtual router.
     # If no virtual router is detected, fallback on default gateway.
+    # See http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/4.8/virtual_machines/user-data.html # noqa
     lease_file = get_latest_lease()
     if not lease_file:
         LOG.debug("No lease file found, using default gateway")
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 61cd36b..26f3168 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -21,7 +21,7 @@ from cloudinit import sources
 from cloudinit import url_helper
 from cloudinit import util
 
-# For reference: http://tinyurl.com/laora4c
+# See https://docs.openstack.org/user-guide/cli-config-drive.html
 
 LOG = logging.getLogger(__name__)