diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2018-10-25 22:26:25 +0200 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2018-10-25 22:26:25 +0200 |
| commit | b120f4f7a670674779a93f8c882c81f44a993888 (patch) | |
| tree | 906d15f6520751b5e8fbeb49b680e673a5cc6aa3 /cloudinit/sources/DataSourceOpenNebula.py | |
| parent | 838581d57c8765d3e487f58bc37ea103af39d26f (diff) | |
| parent | 833adcdf6f85ec2305e62bea5a20f9363bf95507 (diff) | |
| download | vyos-cloud-init-b120f4f7a670674779a93f8c882c81f44a993888.tar.gz vyos-cloud-init-b120f4f7a670674779a93f8c882c81f44a993888.zip | |
Merge tag 'ubuntu/18.4-0ubuntu1_16.04.2' into current
Conflicts:
cloudinit/sources/DataSourceAzure.py
config/cloud.cfg.tmpl
integration-requirements.txt
tools/read-version
Diffstat (limited to 'cloudinit/sources/DataSourceOpenNebula.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index d4a41116..77ccd128 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -232,7 +232,7 @@ class OpenNebulaNetwork(object): # Set IPv6 default gateway gateway6 = self.get_gateway6(c_dev) - if gateway: + if gateway6: devconf['gateway6'] = gateway6 # Set DNS servers and search domains @@ -378,7 +378,7 @@ def read_context_disk_dir(source_dir, asuser=None): if asuser is not None: try: pwd.getpwnam(asuser) - except KeyError as e: + except KeyError: raise BrokenContextDiskDir( "configured user '{user}' does not exist".format( user=asuser)) |