diff options
author | zsdc <taras@vyos.io> | 2021-02-13 19:56:29 +0200 |
---|---|---|
committer | zsdc <taras@vyos.io> | 2021-02-13 23:16:49 +0200 |
commit | b481bfb90b96c70d5d7c988b111058137b1ca60e (patch) | |
tree | 8f58fc22e84fd998e0184a6f894e2ac6f8c59118 /cloudinit/sources/DataSourceAzure.py | |
parent | 377d1bbbdd45aad25c36ab15ce15c93a39df4ce9 (diff) | |
download | vyos-cloud-init-b481bfb90b96c70d5d7c988b111058137b1ca60e.tar.gz vyos-cloud-init-b481bfb90b96c70d5d7c988b111058137b1ca60e.zip |
dhclient: T3309: Removed dhclient from datasources
After the commit 377d1bbbdd45aad25c36ab15ce15c93a39df4ce9 dhclient should be run by Cloud-init properly even without calls from datasources, if this is necessary.
This change solves the problems caused by always active dhclient on eth0 interface when Ec2, GCE, or Azure datasource is used.
Diffstat (limited to 'cloudinit/sources/DataSourceAzure.py')
-rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index a06e6e1f..e076d5dc 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -13,7 +13,6 @@ import os import os.path import re from time import time -from subprocess import call from xml.dom import minidom import xml.etree.ElementTree as ET @@ -269,11 +268,6 @@ class DataSourceAzure(sources.DataSource): dsname = 'Azure' _negotiated = False _metadata_imds = sources.UNSET - process_name = 'dhclient' - - tmpps = os.popen("ps -Af").read() - if process_name not in tmpps[:]: - call(['/sbin/dhclient', DEFAULT_PRIMARY_NIC]) def __init__(self, sys_cfg, distro, paths): sources.DataSource.__init__(self, sys_cfg, distro, paths) |