6af0c1af29
- delete storage/compute - move the code to compute::hypervisor (right place to be) Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
105 lines
2.9 KiB
Puppet
105 lines
2.9 KiB
Puppet
#
|
|
# Copyright (C) 2014 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.
|
|
#
|
|
# Hypervisor Compute node
|
|
#
|
|
|
|
class privatecloud::compute::hypervisor(
|
|
$api_eth = $os_params::api_eth,
|
|
$libvirt_type = $os_params::libvirt_type,
|
|
$ks_nova_internal_proto = $os_params::ks_nova_internal_proto,
|
|
$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,
|
|
$has_ceph = false
|
|
) {
|
|
|
|
include 'privatecloud::compute'
|
|
|
|
exec { 'insert_module_nbd':
|
|
command => '/bin/echo "nbd" > /etc/modules',
|
|
unless => '/bin/grep "nbd" /etc/modules',
|
|
}
|
|
|
|
exec { '/sbin/modprobe nbd':
|
|
unless => '/bin/grep -q "^nbd " "/proc/modules"'
|
|
}
|
|
|
|
file{ '/var/lib/nova/.ssh':
|
|
ensure => directory,
|
|
mode => '0700',
|
|
owner => 'nova',
|
|
group => 'nova',
|
|
require => Class['nova']
|
|
} ->
|
|
file{ '/var/lib/nova/.ssh/id_rsa':
|
|
ensure => present,
|
|
mode => '0600',
|
|
owner => 'nova',
|
|
group => 'nova',
|
|
content => $nova_ssh_private_key
|
|
} ->
|
|
file{ '/var/lib/nova/.ssh/authorized_keys':
|
|
ensure => present,
|
|
mode => '0600',
|
|
owner => 'nova',
|
|
group => 'nova',
|
|
content => $nova_ssh_public_key
|
|
} ->
|
|
file{ '/var/lib/nova/.ssh/config':
|
|
ensure => present,
|
|
mode => '0600',
|
|
owner => 'nova',
|
|
group => 'nova',
|
|
content => "
|
|
Host *
|
|
StrictHostKeyChecking no
|
|
"
|
|
}
|
|
|
|
class { 'nova::compute':
|
|
enabled => true,
|
|
vncproxy_host => $ks_nova_public_host,
|
|
vncserver_proxyclient_address => $api_eth,
|
|
#TODO(EmilienM) Bug #1259545 currently WIP:
|
|
virtio_nic => false,
|
|
neutron_enabled => true
|
|
}
|
|
|
|
class { 'nova::compute::libvirt':
|
|
libvirt_type => $libvirt_type,
|
|
vncserver_listen => '0.0.0.0',
|
|
migration_support => true,
|
|
}
|
|
|
|
exec{'/etc/init.d/open-iscsi start':
|
|
onlyif => '/bin/grep "GenerateName=yes" /etc/iscsi/initiatorname.iscsi'
|
|
}
|
|
exec{'/etc/init.d/open-iscsi stop':
|
|
subscribe => Exec['/etc/init.d/open-iscsi start'],
|
|
refreshonly => true
|
|
}
|
|
|
|
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' |>>
|
|
}
|
|
|
|
}
|