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/DataSourceGCE.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/DataSourceGCE.py')
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index f72d9836..d8162623 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -2,10 +2,8 @@ # # This file is part of cloud-init. See LICENSE file for license information. -import os import datetime import json -from subprocess import call from base64 import b64decode @@ -20,7 +18,6 @@ LOG = logging.getLogger(__name__) MD_V1_URL = 'http://metadata.google.internal/computeMetadata/v1/' BUILTIN_DS_CONFIG = {'metadata_url': MD_V1_URL} REQUIRED_FIELDS = ('instance-id', 'availability-zone', 'local-hostname') -DEFAULT_PRIMARY_NIC = 'eth0' class GoogleMetadataFetcher(object): @@ -53,11 +50,6 @@ class GoogleMetadataFetcher(object): class DataSourceGCE(sources.DataSource): dsname = 'GCE' - 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) |