Merge "Turn SSH auth into the default for live migration"

This commit is contained in:
Jenkins 2016-07-08 15:26:47 +00:00 committed by Gerrit Code Review
commit c327d96e10
2 changed files with 6 additions and 0 deletions

View File

@ -0,0 +1,5 @@
---
upgrade:
- Adding a new nova.conf entry, live_migration_uri. This entry will default
to a ``qemu-ssh://`` uri, which uses the ssh keys that have already been
distributed between all of the compute hosts.

View File

@ -275,6 +275,7 @@ images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
images_rbd_ceph_conf = /etc/ceph/ceph.conf images_rbd_ceph_conf = /etc/ceph/ceph.conf
{% endif %} {% endif %}
live_migration_flag = "{{ nova_libvirt_live_migration_flag }}" live_migration_flag = "{{ nova_libvirt_live_migration_flag }}"
live_migration_uri = "qemu+ssh://nova@%s/system?no_verify=1&keyfile={{ nova_system_home_folder }}/.ssh/id_rsa"
hw_disk_discard = {{ nova_libvirt_hw_disk_discard }} hw_disk_discard = {{ nova_libvirt_hw_disk_discard }}
disk_cachemodes = {{ nova_libvirt_disk_cachemodes }} disk_cachemodes = {{ nova_libvirt_disk_cachemodes }}
{% endif %} {% endif %}