summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/distros/alpine.py3
-rw-r--r--cloudinit/distros/amazon.py4
-rw-r--r--cloudinit/distros/centos.py3
-rw-r--r--cloudinit/distros/fedora.py4
-rw-r--r--cloudinit/distros/opensuse.py3
-rw-r--r--cloudinit/distros/sles.py4
-rw-r--r--cloudinit/distros/ubuntu.py3
-rw-r--r--cloudinit/handlers/shell_script.py3
-rw-r--r--cloudinit/mergers/__init__.py2
-rw-r--r--cloudinit/sources/DataSourceBigstep.py3
-rw-r--r--cloudinit/sources/DataSourceHetzner.py3
-rw-r--r--cloudinit/sources/DataSourceNone.py3
-rw-r--r--cloudinit/sources/helpers/hetzner.py3
13 files changed, 0 insertions, 41 deletions
diff --git a/cloudinit/distros/alpine.py b/cloudinit/distros/alpine.py
index e92ff3fb..ca5bfe80 100644
--- a/cloudinit/distros/alpine.py
+++ b/cloudinit/distros/alpine.py
@@ -8,7 +8,6 @@
from cloudinit import distros
from cloudinit import helpers
-from cloudinit import log as logging
from cloudinit import subp
from cloudinit import util
@@ -16,8 +15,6 @@ from cloudinit.distros.parsers.hostname import HostnameConf
from cloudinit.settings import PER_INSTANCE
-LOG = logging.getLogger(__name__)
-
NETWORK_FILE_HEADER = """\
# This file is generated from information provided by the datasource. Changes
# to it will not persist across an instance reboot. To disable cloud-init's
diff --git a/cloudinit/distros/amazon.py b/cloudinit/distros/amazon.py
index ff9a549f..5fcec952 100644
--- a/cloudinit/distros/amazon.py
+++ b/cloudinit/distros/amazon.py
@@ -12,10 +12,6 @@
from cloudinit.distros import rhel
-from cloudinit import log as logging
-
-LOG = logging.getLogger(__name__)
-
class Distro(rhel.Distro):
diff --git a/cloudinit/distros/centos.py b/cloudinit/distros/centos.py
index 4b803d2e..edb3165d 100644
--- a/cloudinit/distros/centos.py
+++ b/cloudinit/distros/centos.py
@@ -1,9 +1,6 @@
# This file is part of cloud-init. See LICENSE file for license information.
from cloudinit.distros import rhel
-from cloudinit import log as logging
-
-LOG = logging.getLogger(__name__)
class Distro(rhel.Distro):
diff --git a/cloudinit/distros/fedora.py b/cloudinit/distros/fedora.py
index a9490d0e..0fe1fbca 100644
--- a/cloudinit/distros/fedora.py
+++ b/cloudinit/distros/fedora.py
@@ -10,10 +10,6 @@
from cloudinit.distros import rhel
-from cloudinit import log as logging
-
-LOG = logging.getLogger(__name__)
-
class Distro(rhel.Distro):
pass
diff --git a/cloudinit/distros/opensuse.py b/cloudinit/distros/opensuse.py
index b8e557b8..7ca0ef99 100644
--- a/cloudinit/distros/opensuse.py
+++ b/cloudinit/distros/opensuse.py
@@ -13,15 +13,12 @@ from cloudinit import distros
from cloudinit.distros.parsers.hostname import HostnameConf
from cloudinit import helpers
-from cloudinit import log as logging
from cloudinit import subp
from cloudinit import util
from cloudinit.distros import rhel_util as rhutil
from cloudinit.settings import PER_INSTANCE
-LOG = logging.getLogger(__name__)
-
class Distro(distros.Distro):
clock_conf_fn = '/etc/sysconfig/clock'
diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py
index 6e336cbf..f3bfb9c2 100644
--- a/cloudinit/distros/sles.py
+++ b/cloudinit/distros/sles.py
@@ -6,10 +6,6 @@
from cloudinit.distros import opensuse
-from cloudinit import log as logging
-
-LOG = logging.getLogger(__name__)
-
class Distro(opensuse.Distro):
pass
diff --git a/cloudinit/distros/ubuntu.py b/cloudinit/distros/ubuntu.py
index b4c4b0c3..2a1f93d9 100644
--- a/cloudinit/distros/ubuntu.py
+++ b/cloudinit/distros/ubuntu.py
@@ -11,13 +11,10 @@
from cloudinit.distros import debian
from cloudinit.distros import PREFERRED_NTP_CLIENTS
-from cloudinit import log as logging
from cloudinit import util
import copy
-LOG = logging.getLogger(__name__)
-
class Distro(debian.Distro):
diff --git a/cloudinit/handlers/shell_script.py b/cloudinit/handlers/shell_script.py
index 214714bc..9917f551 100644
--- a/cloudinit/handlers/shell_script.py
+++ b/cloudinit/handlers/shell_script.py
@@ -11,13 +11,10 @@
import os
from cloudinit import handlers
-from cloudinit import log as logging
from cloudinit import util
from cloudinit.settings import (PER_ALWAYS)
-LOG = logging.getLogger(__name__)
-
class ShellScriptPartHandler(handlers.Handler):
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py
index 668e3cd6..7fa493a6 100644
--- a/cloudinit/mergers/__init__.py
+++ b/cloudinit/mergers/__init__.py
@@ -7,12 +7,10 @@
import re
from cloudinit import importer
-from cloudinit import log as logging
from cloudinit import type_utils
NAME_MTCH = re.compile(r"(^[a-zA-Z_][A-Za-z0-9_]*)\((.*?)\)$")
-LOG = logging.getLogger(__name__)
DEF_MERGE_TYPE = "list()+dict()+str()"
MERGER_PREFIX = 'm_'
MERGER_ATTR = 'Merger'
diff --git a/cloudinit/sources/DataSourceBigstep.py b/cloudinit/sources/DataSourceBigstep.py
index 52fff20a..63435279 100644
--- a/cloudinit/sources/DataSourceBigstep.py
+++ b/cloudinit/sources/DataSourceBigstep.py
@@ -7,13 +7,10 @@
import errno
import json
-from cloudinit import log as logging
from cloudinit import sources
from cloudinit import url_helper
from cloudinit import util
-LOG = logging.getLogger(__name__)
-
class DataSourceBigstep(sources.DataSource):
diff --git a/cloudinit/sources/DataSourceHetzner.py b/cloudinit/sources/DataSourceHetzner.py
index a86035e0..79353882 100644
--- a/cloudinit/sources/DataSourceHetzner.py
+++ b/cloudinit/sources/DataSourceHetzner.py
@@ -6,15 +6,12 @@
"""Hetzner Cloud API Documentation.
https://docs.hetzner.cloud/"""
-from cloudinit import log as logging
from cloudinit import net as cloudnet
from cloudinit import sources
from cloudinit import util
import cloudinit.sources.helpers.hetzner as hc_helper
-LOG = logging.getLogger(__name__)
-
BASE_URL_V1 = 'http://169.254.169.254/hetzner/v1'
BUILTIN_DS_CONFIG = {
diff --git a/cloudinit/sources/DataSourceNone.py b/cloudinit/sources/DataSourceNone.py
index e6250801..b7656ac5 100644
--- a/cloudinit/sources/DataSourceNone.py
+++ b/cloudinit/sources/DataSourceNone.py
@@ -4,11 +4,8 @@
#
# This file is part of cloud-init. See LICENSE file for license information.
-from cloudinit import log as logging
from cloudinit import sources
-LOG = logging.getLogger(__name__)
-
class DataSourceNone(sources.DataSource):
diff --git a/cloudinit/sources/helpers/hetzner.py b/cloudinit/sources/helpers/hetzner.py
index 72edb023..33dc4c53 100644
--- a/cloudinit/sources/helpers/hetzner.py
+++ b/cloudinit/sources/helpers/hetzner.py
@@ -3,15 +3,12 @@
#
# This file is part of cloud-init. See LICENSE file for license information.
-from cloudinit import log as logging
from cloudinit import url_helper
from cloudinit import util
import base64
import binascii
-LOG = logging.getLogger(__name__)
-
def read_metadata(url, timeout=2, sec_between=2, retries=30):
response = url_helper.readurl(url, timeout=timeout,