diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-10 23:55:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-10 23:55:48 +0000 |
| commit | e7ebcf34c13e33811e20d8dca1c5e8e7af3ea4ca (patch) | |
| tree | 4994379e946a5baec81b7f87c1f7a2a68cc3d2fd | |
| parent | 0030c6ed02776a104c5ecec82347bb6422a1473d (diff) | |
| parent | dc131983bac9d01355d7337241871b615866f6e6 (diff) | |
| download | nova-e7ebcf34c13e33811e20d8dca1c5e8e7af3ea4ca.tar.gz nova-e7ebcf34c13e33811e20d8dca1c5e8e7af3ea4ca.tar.xz nova-e7ebcf34c13e33811e20d8dca1c5e8e7af3ea4ca.zip | |
Merge "add libvirt_inject_key flag fix bug #971640"
| -rw-r--r-- | nova/virt/libvirt/connection.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 36bb0ea0c..8ec24f8d3 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -102,6 +102,9 @@ libvirt_opts = [ default=False, help='Inject the admin password at boot time, ' 'without an agent.'), + cfg.BoolOpt('libvirt_inject_key', + default=True, + help='Inject the ssh public key at boot time'), cfg.BoolOpt('use_usb_tablet', default=True, help='Sync virtual and real mouse cursors in Windows VMs'), @@ -1277,7 +1280,7 @@ class LibvirtConnection(driver.ComputeDriver): self._create_local(basepath('disk.config'), 64, unit='M', fs_format='msdos', label=label) # 64MB - if instance['key_data']: + if FLAGS.libvirt_inject_key and instance['key_data']: key = str(instance['key_data']) else: key = None |