237e613a17
The unit tests jobs are failing because of missing pre conditions for the new shared class introduced by Ib233689fdcdda391596d01a21f77bd8e1672ae04. Additionally this change moved some classes around so that the tests are now failing due to duplicate class declarations for nova::compute::libvirt::services. This change moves the include that pulls in the declaration first prior to the include that exists in tripleo::profile::base::nova::libvirt. The selinux test was also failing due to a type issue with the fact being used (boolean vs string) Change-Id: I5bd4b61d6008820729d58f7743e7e61955dd6f51 Closes-Bug: #1707034
53 lines
1.7 KiB
Puppet
53 lines
1.7 KiB
Puppet
# Copyright 2016 Red Hat, 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.
|
|
#
|
|
# == Class: tripleo::profile::base::nova::libvirt
|
|
#
|
|
# Libvirt profile for tripleo. It will deploy Libvirt service and configure it.
|
|
#
|
|
# === Parameters
|
|
#
|
|
# [*step*]
|
|
# (Optional) The current step in deployment. See tripleo-heat-templates
|
|
# for more details.
|
|
# Defaults to hiera('step')
|
|
#
|
|
class tripleo::profile::base::nova::libvirt (
|
|
$step = Integer(hiera('step')),
|
|
) {
|
|
include ::tripleo::profile::base::nova::compute_libvirt_shared
|
|
|
|
if $step >= 4 {
|
|
include ::tripleo::profile::base::nova
|
|
include ::tripleo::profile::base::nova::migration::client
|
|
include ::nova::compute::libvirt::services
|
|
|
|
file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
|
|
'/etc/libvirt/qemu/networks/default.xml']:
|
|
ensure => absent,
|
|
before => Service['libvirt'],
|
|
}
|
|
|
|
# in case libvirt has been already running before the Puppet run, make
|
|
# sure the default network is destroyed
|
|
exec { 'libvirt-default-net-destroy':
|
|
command => '/usr/bin/virsh net-destroy default',
|
|
onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
|
|
before => Service['libvirt'],
|
|
}
|
|
|
|
include ::nova::compute::libvirt::qemu
|
|
}
|
|
}
|