X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fnova%2Fmanifests%2Fcompute%2Frbd.pp;fp=3rdparty%2Fmodules%2Fnova%2Fmanifests%2Fcompute%2Frbd.pp;h=0000000000000000000000000000000000000000;hb=6e1426dc77fb4e5d51f07c187c6f2219431dc31e;hp=9bb0dceaf167816a87ff8cb60a3883d0092d3127;hpb=87423ba664cd5f2bb462ebadd08b1a90d0fe1c8d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/nova/manifests/compute/rbd.pp b/3rdparty/modules/nova/manifests/compute/rbd.pp
deleted file mode 100644
index 9bb0dceaf..000000000
--- a/3rdparty/modules/nova/manifests/compute/rbd.pp
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2014 OpenStack Fondation
-#
-# Author: Emilien Macchi <emilien.macchi@enovance.com>
-#         Donald Talton  <dotalton@cisco.com>
-#
-# 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: nova::compute::rbd
-#
-# Configure nova-compute to store virtual machines on RBD
-#
-# === Parameters
-#
-# [*libvirt_images_rbd_pool*]
-#   (optional) The RADOS pool in which rbd volumes are stored.
-#   Defaults to 'rbd'.
-#
-# [*libvirt_images_rbd_ceph_conf*]
-#   (optional) The path to the ceph configuration file to use.
-#   Defaults to '/etc/ceph/ceph.conf'.
-#
-# [*libvirt_rbd_user*]
-#   (Required) The RADOS client name for accessing rbd volumes.
-#
-# [*libvirt_rbd_secret_uuid*]
-#   (optional) The libvirt uuid of the secret for the rbd_user.
-#   Required to use cephx.
-#   Default to false.
-#
-# [*libvirt_rbd_secret_key*]
-#   (optional) The cephx key to use as key for the libvirt secret,
-#   it must be base64 encoded; when not provided this key will be
-#   requested to the ceph cluster, which assumes the node is
-#   provided of the client.admin keyring as well.
-#   Default to undef.
-#
-# [*rbd_keyring*]
-#   (optional) The keyring name to use when retrieving the RBD secret
-#   Default to 'client.nova'
-#
-
-class nova::compute::rbd (
-  $libvirt_rbd_user,
-  $libvirt_rbd_secret_uuid      = false,
-  $libvirt_rbd_secret_key       = undef,
-  $libvirt_images_rbd_pool      = 'rbd',
-  $libvirt_images_rbd_ceph_conf = '/etc/ceph/ceph.conf',
-  $rbd_keyring                  = 'client.nova',
-) {
-
-  include nova::params
-
-  nova_config {
-    'libvirt/images_type':          value => 'rbd';
-    'libvirt/images_rbd_pool':      value => $libvirt_images_rbd_pool;
-    'libvirt/images_rbd_ceph_conf': value => $libvirt_images_rbd_ceph_conf;
-    'libvirt/rbd_user':             value => $libvirt_rbd_user;
-  }
-
-  if $libvirt_rbd_secret_uuid {
-    nova_config {
-      'libvirt/rbd_secret_uuid': value => $libvirt_rbd_secret_uuid;
-    }
-
-    file { '/etc/nova/secret.xml':
-      content => template('nova/secret.xml-compute.erb')
-    }
-
-    exec { 'get-or-set virsh secret':
-      command => '/usr/bin/virsh secret-define --file /etc/nova/secret.xml | /usr/bin/awk \'{print $2}\' | sed \'/^$/d\' > /etc/nova/virsh.secret',
-      creates => '/etc/nova/virsh.secret',
-      require => File['/etc/nova/secret.xml']
-    }
-
-    if $libvirt_rbd_secret_key {
-      $libvirt_key = $libvirt_rbd_secret_key
-    } else {
-      $libvirt_key = "$(ceph auth get-key ${rbd_keyring})"
-    }
-    exec { 'set-secret-value virsh':
-      command => "/usr/bin/virsh secret-set-value --secret ${libvirt_rbd_secret_uuid} --base64 ${libvirt_key}",
-      unless  => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid}",
-      require => Exec['get-or-set virsh secret']
-    }
-
-  }
-
-}