Merge ~jgrimm/cloud-init:fix_tiny_url into cloud-init:master

Proposed by Jon Grimm
Status: Merged
Merged at revision: aab609104988b9d14572eb8fa1dd28a8156c0aea
Proposed branch: ~jgrimm/cloud-init:fix_tiny_url
Merge into: cloud-init:master
Diff against target: 91 lines (+8/-9)
6 files modified
cloudinit/config/cc_yum_add_repo.py (+1/-1)
cloudinit/distros/debian.py (+1/-2)
cloudinit/distros/parsers/hosts.py (+2/-2)
cloudinit/distros/rhel.py (+2/-2)
cloudinit/sources/DataSourceCloudStack.py (+1/-1)
cloudinit/sources/helpers/openstack.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+321744@code.launchpad.net

Description of the change

Remove/fix URL shortened references.

Uses '# noqa' to allow >80 char length lines for long URLs if needed.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
2index ef8535e..a04e1b2 100644
3--- a/cloudinit/config/cc_yum_add_repo.py
4+++ b/cloudinit/config/cc_yum_add_repo.py
5@@ -52,7 +52,7 @@ def _format_repo_value(val):
6 return str(int(val))
7 if isinstance(val, (list, tuple)):
8 # Can handle 'lists' in certain cases
9- # See: http://bit.ly/Qqrf1t
10+ # See: https://linux.die.net/man/5/yum.conf
11 return "\n ".join([_format_repo_value(v) for v in val])
12 if not isinstance(val, six.string_types):
13 return str(val)
14diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
15index 3f0f9d5..16f8d95 100644
16--- a/cloudinit/distros/debian.py
17+++ b/cloudinit/distros/debian.py
18@@ -143,8 +143,7 @@ class Distro(distros.Distro):
19 pkgs = []
20
21 e = os.environ.copy()
22- # See: http://tiny.cc/kg91fw
23- # Or: http://tiny.cc/mh91fw
24+ # See: http://manpages.ubuntu.com/manpages/xenial/man7/debconf.7.html
25 e['DEBIAN_FRONTEND'] = 'noninteractive'
26
27 wcfg = self.get_option("apt_get_wrapper", APT_GET_WRAPPER)
28diff --git a/cloudinit/distros/parsers/hosts.py b/cloudinit/distros/parsers/hosts.py
29index 87f164b..6444458 100644
30--- a/cloudinit/distros/parsers/hosts.py
31+++ b/cloudinit/distros/parsers/hosts.py
32@@ -10,8 +10,8 @@ from cloudinit.distros.parsers import chop_comment
33
34
35 # See: man hosts
36-# or http://unixhelp.ed.ac.uk/CGI/man-cgi?hosts
37-# or http://tinyurl.com/6lmox3
38+# or https://linux.die.net/man/5/hosts
39+# or https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-configfiles.html # noqa
40 class HostsConf(object):
41 def __init__(self, text):
42 self._text = text
43diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
44index 372c7d0..1fecb61 100644
45--- a/cloudinit/distros/rhel.py
46+++ b/cloudinit/distros/rhel.py
47@@ -28,7 +28,7 @@ def _make_sysconfig_bool(val):
48
49
50 class Distro(distros.Distro):
51- # See: http://tiny.cc/6r99fw
52+ # See: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Networking_Guide/sec-Network_Configuration_Using_sysconfig_Files.html # noqa
53 clock_conf_fn = "/etc/sysconfig/clock"
54 locale_conf_fn = '/etc/sysconfig/i18n'
55 systemd_locale_conf_fn = '/etc/locale.conf'
56@@ -130,8 +130,8 @@ class Distro(distros.Distro):
57 rhel_util.update_sysconfig_file(out_fn, host_cfg)
58
59 def _select_hostname(self, hostname, fqdn):
60- # See: http://bit.ly/TwitgL
61 # Should be fqdn if we can use it
62+ # See: https://www.centos.org/docs/5/html/Deployment_Guide-en-US/ch-sysconfig.html#s2-sysconfig-network # noqa
63 if fqdn:
64 return fqdn
65 return hostname
66diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
67index b0ab275..ceef028 100644
68--- a/cloudinit/sources/DataSourceCloudStack.py
69+++ b/cloudinit/sources/DataSourceCloudStack.py
70@@ -207,8 +207,8 @@ def get_latest_lease():
71
72 def get_vr_address():
73 # Get the address of the virtual router via dhcp leases
74- # see http://bit.ly/T76eKC for documentation on the virtual router.
75 # If no virtual router is detected, fallback on default gateway.
76+ # See http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/4.8/virtual_machines/user-data.html # noqa
77 lease_file = get_latest_lease()
78 if not lease_file:
79 LOG.debug("No lease file found, using default gateway")
80diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
81index 61cd36b..26f3168 100644
82--- a/cloudinit/sources/helpers/openstack.py
83+++ b/cloudinit/sources/helpers/openstack.py
84@@ -21,7 +21,7 @@ from cloudinit import sources
85 from cloudinit import url_helper
86 from cloudinit import util
87
88-# For reference: http://tinyurl.com/laora4c
89+# See https://docs.openstack.org/user-guide/cli-config-drive.html
90
91 LOG = logging.getLogger(__name__)
92

Subscribers

People subscribed via source and target branches