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/DataSourceEc2.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/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index b49a08db..9ccf2cdc 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -10,7 +10,6 @@ import os import time -from subprocess import call from cloudinit import ec2_utils as ec2 from cloudinit import log as logging @@ -27,7 +26,6 @@ SKIP_METADATA_URL_CODES = frozenset([uhelp.NOT_FOUND]) STRICT_ID_PATH = ("datasource", "Ec2", "strict_id") STRICT_ID_DEFAULT = "warn" -DEFAULT_PRIMARY_NIC = 'eth0' class CloudNames(object): @@ -45,12 +43,6 @@ class CloudNames(object): class DataSourceEc2(sources.DataSource): dsname = 'Ec2' - process_name = 'dhclient' - - tmpps = os.popen("ps -Af").read() - if process_name not in tmpps[:]: - call(['/sbin/dhclient', DEFAULT_PRIMARY_NIC]) - # Default metadata urls that will be used if none are provided # They will be checked for 'resolveability' and some of the # following may be discarded if they do not resolve |