mgr: move to end of file

so that admin keyring is already created

Author: bmwiedemann

chef/cookbooks/ceph/recipes/mon.rb

@@ -32,53 +32,9 @@
   action :create
 end
 
-directory "/var/lib/ceph/mgr/ceph-#{mon_name}" do
-  owner "ceph"
-  group "ceph"
-  mode "0750"
-  recursive true
-  action :create
-end
-
-
 # TODO cluster name
 cluster = "ceph"
 
-
-unless File.exist?("/var/lib/ceph/mgr/ceph-#{mon_name}/done")
-  keyring = "/var/lib/ceph/mgr/#{cluster}-#{mon_name}/keyring"
-  execute "create mgr keyring" do
-    command "ceph auth get-or-create mgr.#{mon_name} \
-             mon 'allow profile mgr' osd 'allow *' mds 'allow *' \
-             -o #{keyring} && \
-           chown ceph.ceph #{keyring}"
-    not_if { File.exist?(keyring) }
-  end
-  ruby_block "finalise" do
-    block do
-      ["done"].each do |ack|
-        File.open("/var/lib/ceph/mgr/ceph-#{mon_name}/#{ack}", "w").close
-      end
-    end
-  end
-end
-
-service "ceph_mgr" do
-  case service_type
-  when "upstart"
-    service_name "ceph-mgr-all-starter"
-    provider Chef::Provider::Service::Upstart
-  when "systemd"
-    service_name "ceph-mgr@#{mon_name}"
-  else
-    service_name "ceph"
-  end
-  supports restart: true, status: true
-  action [:enable, :start]
-  subscribes :restart, resources(template: "/etc/ceph/ceph.conf")
-end
-
-
 unless File.exist?("/var/lib/ceph/mon/ceph-#{mon_name}/done")
   keyring = "#{Chef::Config[:file_cache_path]}/#{cluster}-#{mon_name}.mon.keyring"
 
@@ -236,3 +192,44 @@
     end
   end
 end
+
+directory "/var/lib/ceph/mgr/ceph-#{mon_name}" do
+  owner "ceph"
+  group "ceph"
+  mode "0750"
+  recursive true
+  action :create
+end
+
+unless File.exist?("/var/lib/ceph/mgr/ceph-#{mon_name}/done")
+  keyring = "/var/lib/ceph/mgr/#{cluster}-#{mon_name}/keyring"
+  execute "create mgr keyring" do
+    command "ceph auth get-or-create mgr.#{mon_name} \
+             mon 'allow profile mgr' osd 'allow *' mds 'allow *' \
+             -o #{keyring} && \
+           chown ceph.ceph #{keyring}"
+    not_if { File.exist?(keyring) }
+  end
+  ruby_block "finalise" do
+    block do
+      ["done"].each do |ack|
+        File.open("/var/lib/ceph/mgr/ceph-#{mon_name}/#{ack}", "w").close
+      end
+    end
+  end
+end
+
+service "ceph_mgr" do
+  case service_type
+  when "upstart"
+    service_name "ceph-mgr-all-starter"
+    provider Chef::Provider::Service::Upstart
+  when "systemd"
+    service_name "ceph-mgr@#{mon_name}"
+  else
+    service_name "ceph"
+  end
+  supports restart: true, status: true
+  action [:enable, :start]
+  subscribes :restart, resources(template: "/etc/ceph/ceph.conf")
+end