openstack/fuel-library
Code Issues Proposed changes

Fix service cinder restart

Browse Source
This commit is contained in:
root 2013-08-19 11:15:39 +04:00 committed by Andrew Woodward
parent 1e15eb0236
commit 087c323361
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deployment/puppet/ceph/manifests/apt.pp
View File

@ -6,10 +6,22 @@ class ceph::apt (
key_source => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc', key_source => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
require => Class['ceph::ssh'] require => Class['ceph::ssh']
} }
apt::key { 'radosgw':
key => '6EAEAE2203C3951A',
require => Class['ceph::ssh']
}
Apt::Source {
require => Apt::Key['ceph', 'radosgw'],
release => $::lsbdistcodename,
before => Package['ceph'],
}
apt::source { 'ceph': apt::source { 'ceph':
location => "http://ceph.com/debian-${release}/", location => "http://ceph.com/debian-${release}/",
release => $::lsbdistcodename, }
require => Apt::Key['ceph'], apt::source { 'radosgw-apache2':
before => Package['ceph'], location => "http://gitbuilder.ceph.com/apache2-deb-precise-x86_64-basic/ref/master/",
}
apt::source { 'radosgw-fastcgi':
location => "http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-precise-x86_64-basic/ref/master/",
} }
} }

21
deployment/puppet/ceph/manifests/cinder.pp
View File

@ -15,10 +15,6 @@ class ceph::cinder (
require => Package['ceph'], require => Package['ceph'],
returns => [0,1], returns => [0,1],
} }
Cinder_config<||> ~> Service['cinder-volume']
File_line<||> ~> Service['cinder-volume']
cinder_config { cinder_config {
'DEFAULT/volume_driver': value => $volume_driver; 'DEFAULT/volume_driver': value => $volume_driver;
'DEFAULT/rbd_pool': value => $rbd_pool; 'DEFAULT/rbd_pool': value => $rbd_pool;
@ -30,22 +26,23 @@ class ceph::cinder (
path => '/etc/init/cinder-volume.conf', path => '/etc/init/cinder-volume.conf',
line => 'env CEPH_ARGS="--id volumes"', line => 'env CEPH_ARGS="--id volumes"',
} }
service { 'cinder-volume': File_line<||> ~> Service['cinder-volume']
ensure => "running", Cinder_config<||> ~> Service['cinder-volume']
enable => true,
hasstatus => true,
hasrestart => true,
}
exec { 'Create keys for pool volumes': exec { 'Create keys for pool volumes':
command => 'ceph auth get-or-create client.volumes > /etc/ceph/ceph.client.volumes.keyring', command => 'ceph auth get-or-create client.volumes > /etc/ceph/ceph.client.volumes.keyring',
before => File['/etc/ceph/ceph.client.volumes.keyring'], before => File['/etc/ceph/ceph.client.volumes.keyring'],
require => [Package['ceph'], Exec['Copy configs']], require => [Package['ceph'], Exec['Copy configs']],
notify => Service['cinder-volume'],
returns => [0,1], returns => [0,1],
} }
file { '/etc/ceph/ceph.client.volumes.keyring': file { '/etc/ceph/ceph.client.volumes.keyring':
owner => cinder, owner => cinder,
group => cinder, group => cinder,
require => Exec['Create keys for pool volumes'], require => Exec['Create keys for pool volumes'],
} }
service { 'cinder-volume':
ensure => 'running',
enable => true,
}
} }
} }

5
deployment/puppet/ceph/manifests/glance.pp
View File

@ -19,9 +19,10 @@ class ceph::glance (
'DEFAULT/rbd_store_user': value => $rbd_store_user; 'DEFAULT/rbd_store_user': value => $rbd_store_user;
'DEFAULT/rbd_store_pool': value => $rbd_store_pool; 'DEFAULT/rbd_store_pool': value => $rbd_store_pool;
'DEFAULT/show_image_direct_url': value => $show_image_direct_url; 'DEFAULT/show_image_direct_url': value => $show_image_direct_url;
}~> }
Glance_api_config<||> ~> Service['glance-api']
service { 'glance-api': service { 'glance-api':
ensure => "running", ensure => 'running',
enable => true, enable => true,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,