Change nova_virt_type from lxc to lxd

lxc was originally chosen due to faulty documentation
and / or error.  The correct value should be lxd
to avoid confusion, as well as possibly allow for
lxc support via libvirt in the future.

Change-Id: Id72228ab31e345eecbd4de0031c156622795a1da
This commit is contained in:
Michael Gugino 2016-08-25 14:37:14 -04:00
parent 522ce07e9f
commit 41c1dbcdcb
4 changed files with 6 additions and 6 deletions

View File

@ -125,7 +125,7 @@ nova_virt_types:
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
nova_scheduler_use_baremetal_filters: False
nova_scheduler_tracks_instance_changes: True
lxc:
lxd:
nova_compute_driver: lxd.LXDDriver
nova_scheduler_host_manager: host_manager
nova_reserved_host_memory_mb: 2048
@ -156,7 +156,7 @@ nova_virt_types:
nova_supported_virt_types:
- qemu
- kvm
- lxc
- lxd
- ironic
- powervm

View File

@ -2,5 +2,5 @@
features:
- The os_nova role can now deploy the nova-lxd hypervisor.
This can be achieved by setting ``nova_virt_type`` to
``lxc`` on a per-host basis in ``openstack_user_config.yml``
``lxd`` on a per-host basis in ``openstack_user_config.yml``
or on a global basis in ``user_variables.yml``.

View File

@ -105,7 +105,7 @@ auth_strategy = keystone
## Vif
linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }}
{% if nova_virt_type in ['kvm', 'lxc', 'qemu', 'xen'] %}
{% if nova_virt_type in ['kvm', 'lxd', 'qemu', 'xen'] %}
libvirt_vif_type = ethernet
{% endif %}
vif_plugging_timeout = 10
@ -259,7 +259,7 @@ admin_url = {{ keystone_service_adminuri }}/v2.0
api_endpoint = {{ ironic_service_adminurl }}
{% endif %}
{% if nova_virt_type in ['kvm', 'lxc', 'qemu', 'xen'] %}
{% if nova_virt_type in ['kvm', 'qemu', 'xen'] %}
[libvirt]
inject_partition = {{ nova_libvirt_inject_partition }}
inject_password = {{ nova_libvirt_inject_password }}

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
nova_virt_type: lxc
nova_virt_type: lxd
tempest_img_url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz"
tempest_img_disk_format: raw