diff options
| author | zdc <zdc@users.noreply.github.com> | 2021-02-13 23:26:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 23:26:26 +0200 |
| commit | 32b8b9ef8fd40d7d9e5a03ce37493eec220a9b54 (patch) | |
| tree | 8f58fc22e84fd998e0184a6f894e2ac6f8c59118 /cloudinit/sources/DataSourceEc2.py | |
| parent | d695c78d291d192cc711659f89524395b3bd1d6f (diff) | |
| parent | b481bfb90b96c70d5d7c988b111058137b1ca60e (diff) | |
| download | vyos-cloud-init-32b8b9ef8fd40d7d9e5a03ce37493eec220a9b54.tar.gz vyos-cloud-init-32b8b9ef8fd40d7d9e5a03ce37493eec220a9b54.zip | |
Merge pull request #31 from zdc/T3309-crux
dhclient: T3309: Removed dhclient from datasources
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 |