From e14120563938d40b1860e1d4945e578503ab428e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 19 Jul 2017 15:19:30 +0200 Subject: Make calls to nova::compute::rbd from libvirt profile Some of the tasks carried by nova::compute::rbd class apply libvirt. Change-Id: Ib233689fdcdda391596d01a21f77bd8e1672ae04 Depends-On: I28557deb13b75922932cd3e86c3467a541c988d0 --- manifests/profile/base/nova/compute/libvirt.pp | 20 +--------- .../profile/base/nova/compute_libvirt_shared.pp | 46 ++++++++++++++++++++++ manifests/profile/base/nova/libvirt.pp | 3 ++ 3 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 manifests/profile/base/nova/compute_libvirt_shared.pp (limited to 'manifests/profile') diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index 8a7c4d6..ccecaf2 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -29,25 +29,7 @@ class tripleo::profile::base::nova::compute::libvirt ( if $step >= 4 { include ::tripleo::profile::base::nova::compute include ::tripleo::profile::base::nova::migration::client - - # Ceph + Libvirt - $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) - $rbd_persistent_storage = hiera('rbd_persistent_storage', false) - if $rbd_ephemeral_storage or $rbd_persistent_storage { - include ::nova::compute::rbd - } - - if $rbd_ephemeral_storage { - class { '::nova::compute::libvirt': - libvirt_disk_cachemodes => ['network=writeback'], - libvirt_hw_disk_discard => 'unmap', - } - } else { - include ::nova::compute::libvirt - } - - include ::nova::compute::libvirt::qemu - } + include ::tripleo::profile::base::nova::compute_libvirt_shared } diff --git a/manifests/profile/base/nova/compute_libvirt_shared.pp b/manifests/profile/base/nova/compute_libvirt_shared.pp new file mode 100644 index 0000000..36235cd --- /dev/null +++ b/manifests/profile/base/nova/compute_libvirt_shared.pp @@ -0,0 +1,46 @@ +# 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::compute_libvirt_shared +# +# 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::compute_libvirt_shared ( + $step = Integer(hiera('step')), +) { + if $step >= 4 { + # Ceph + Libvirt + $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) + $rbd_persistent_storage = hiera('rbd_persistent_storage', false) + if $rbd_ephemeral_storage or $rbd_persistent_storage { + include ::nova::compute::rbd + } + + if $rbd_ephemeral_storage { + class { '::nova::compute::libvirt': + libvirt_disk_cachemodes => ['network=writeback'], + libvirt_hw_disk_discard => 'unmap', + } + } else { + include ::nova::compute::libvirt + } + } +} diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp index 06baa39..332e33b 100644 --- a/manifests/profile/base/nova/libvirt.pp +++ b/manifests/profile/base/nova/libvirt.pp @@ -44,6 +44,9 @@ class tripleo::profile::base::nova::libvirt ( onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"', before => Service['libvirt'], } + + include ::nova::compute::libvirt::qemu } + include ::tripleo::profile::base::nova::compute_libvirt_shared } -- cgit 1.2.3-korg