stackforge/puppet-openstack-cloud
Code Issues Proposed changes

compute: move ceph config to the right place

Browse Source 
- delete storage/compute
- move the code to compute::hypervisor (right place to be)

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-13 15:38:50 -05:00
parent 992f615cf2
commit 6af0c1af29
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/compute/hypervisor.pp
View File

@ -23,7 +23,8 @@ class privatecloud::compute::hypervisor(
$ks_nova_internal_host = $os_params::ks_nova_internal_host,
$ks_nova_public_host = $os_params::ks_nova_public_host,
$nova_ssh_private_key = $os_params::nova_ssh_private_key,
$nova_ssh_public_key = $os_params::nova_ssh_public_key
$nova_ssh_public_key = $os_params::nova_ssh_public_key,
$has_ceph = false
) {
include 'privatecloud::compute'
@ -94,4 +95,10 @@ Host *
class { 'nova::compute::neutron': }
if $has_ceph {
File <<| tag == 'ceph_compute_secret_file' |>>
Exec <<| tag == 'get_or_set_virsh_secret' |>>
Exec <<| tag == 'set_secret_value_virsh' |>>
}
}

28
manifests/storage/compute.pp
View File

@ -1,28 +0,0 @@
#
# Copyright (C) 2013 eNovance SAS <licensing@enovance.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 privatecloud::storage::compute(
$has_ceph = false,
){
if $has_ceph {
File <<| tag == 'ceph_compute_secret_file' |>>
Exec <<| tag == 'get_or_set_virsh_secret' |>>
Exec <<| tag == 'set_secret_value_virsh' |>>
}
}