79192de310
In https://review.openstack.org/243098 nova_virt_type auto-detection was implemented, but the default nova_virt_type value of kvm was left in place, resulting in the auto-detection never happening. This patch implements the auto-detection if nova-virt_type is not set and removes the default value for nova-virt_type. Change-Id: Ic1c8f042bc6bbee542373d335f338866efa06dc7
22 lines
766 B
YAML
22 lines
766 B
YAML
---
|
|
# Copyright 2014, Rackspace US, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
- include: nova_compute_kvm.yml
|
|
when: nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
|
|
|
|
- include: nova_compute_key_populate.yml
|
|
|
|
- include: nova_compute_key_distribute.yml
|