Fix service cinder restart

deployment/puppet/ceph/manifests/apt.pp

@@ -6,10 +6,22 @@ class ceph::apt (
     key_source => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
     require    => Class['ceph::ssh']
   }
-  apt::source { 'ceph':
-    location => "http://ceph.com/debian-${release}/",
+  apt::key { 'radosgw':
+    key     => '6EAEAE2203C3951A',
+    require => Class['ceph::ssh']  
+  }
+  Apt::Source {
+    require => Apt::Key['ceph', 'radosgw'],
     release => $::lsbdistcodename,
-    require  => Apt::Key['ceph'],
     before  => Package['ceph'],
   }
+  apt::source { 'ceph':
+    location => "http://ceph.com/debian-${release}/",
+  }
+  apt::source { 'radosgw-apache2':
+    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/",
+  }
 }

deployment/puppet/ceph/manifests/cinder.pp

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

deployment/puppet/ceph/manifests/glance.pp

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