summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2019-09-27 14:48:52 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-09-27 14:48:52 +0000
commit762f230cb37bdceaed3fb264e9cede48c2749d3f (patch)
treef56af9a8741d3f9b6c140f2cf53ef72fbfd5d0a6 /cloudinit
parentf80f7f0d82eaf05e68419c7ac87bf5d4c934b796 (diff)
downloadvyos-cloud-init-762f230cb37bdceaed3fb264e9cede48c2749d3f.tar.gz
vyos-cloud-init-762f230cb37bdceaed3fb264e9cede48c2749d3f.zip
ovf: do not generate random instance-id for IMC customization path
Cloud-init will not operate properly if the instance-id value changes on each boot. This is the source of a number of behavioral bugs filed against cloud-init with OVF datasource. Instead, use a static instance-id value, iid-vmware-imc, similar to iid-dsovf.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceOVF.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py
index b1561892..e7794aab 100644
--- a/cloudinit/sources/DataSourceOVF.py
+++ b/cloudinit/sources/DataSourceOVF.py
@@ -406,9 +406,7 @@ def read_vmware_imc(config):
if config.timezone:
cfg['timezone'] = config.timezone
- # Generate a unique instance-id so that re-customization will
- # happen in cloud-init
- md['instance-id'] = "iid-vmware-" + util.rand_str(strlen=8)
+ md['instance-id'] = "iid-vmware-imc"
return (md, ud, cfg)