diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_set_hostname.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_set_hostname.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_set_hostname.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/CloudConfig/cc_set_hostname.py b/cloudinit/CloudConfig/cc_set_hostname.py index bc190049..4f19b0c8 100644 --- a/cloudinit/CloudConfig/cc_set_hostname.py +++ b/cloudinit/CloudConfig/cc_set_hostname.py @@ -15,18 +15,18 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + import cloudinit.util as util -import subprocess -def handle(name,cfg,cloud,log,args): +def handle(_name,cfg,cloud,log,_args): if util.get_cfg_option_bool(cfg,"preserve_hostname",False): log.debug("preserve_hostname is set. not setting hostname") return(True) - ( hostname, fqdn ) = util.get_hostname_fqdn(cfg, cloud) + ( hostname, _fqdn ) = util.get_hostname_fqdn(cfg, cloud) try: set_hostname(hostname, log) - except Exception as e: + except Exception: util.logexc(log) log.warn("failed to set hostname to %s\n", hostname) |