diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 22:54:29 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 22:54:29 -0400 |
| commit | cfbf95f531f4e637fc707478e4ebbb5af39db355 (patch) | |
| tree | 48b7bf1d110b4f4b35a8833ea83d0c9c54775268 /cloudinit/sources/DataSourceOVF.py | |
| parent | 14271e89f3a2a6a813fc5aac7163da3defcfd4c1 (diff) | |
| parent | d4b587ebf500ddc2259fffc94a3c69c199c9a427 (diff) | |
| download | vyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.tar.gz vyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index f2bb9366..43347cfb 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -37,16 +37,16 @@ from cloudinit.sources.helpers.vmware.imc.config_file \ import ConfigFile from cloudinit.sources.helpers.vmware.imc.config_nic \ import NicConfigurator +from cloudinit.sources.helpers.vmware.imc.guestcust_error \ + import GuestCustErrorEnum from cloudinit.sources.helpers.vmware.imc.guestcust_event \ import GuestCustEventEnum from cloudinit.sources.helpers.vmware.imc.guestcust_state \ import GuestCustStateEnum -from cloudinit.sourceshelpers.vmware.imc.guestcust_error \ - import GuestCustErrorEnum -from cloudinit.sourceshelpers.vmware.imc.guestcust_util import ( - set_customization_status, +from cloudinit.sources.helpers.vmware.imc.guestcust_util import ( + enable_nics, get_nics_to_enable, - enable_nics + set_customization_status ) LOG = logging.getLogger(__name__) |