Simplify subvolume creation, add validation

Signed-off-by: Eric Jackson <ejackson@suse.com>

Makefile

@@ -379,8 +379,6 @@ copy-files:
 	install -m 644 srv/salt/ceph/migrate/nodes/*.sls $(DESTDIR)/srv/salt/ceph/migrate/nodes/
 	install -d -m 755 $(DESTDIR)/srv/salt/ceph/migrate/policy
 	install -m 644 srv/salt/ceph/migrate/policy/*.sls $(DESTDIR)/srv/salt/ceph/migrate/policy/
-	install -d -m 755 $(DESTDIR)/srv/salt/ceph/migrate/subvolume
-	install -m 644 srv/salt/ceph/migrate/subvolume/*.sls $(DESTDIR)/srv/salt/ceph/migrate/subvolume/
 	# state files - mines
 	install -d -m 755 $(DESTDIR)/srv/salt/ceph/mines
 	install -m 644 srv/salt/ceph/mines/*.sls $(DESTDIR)/srv/salt/ceph/mines/
@@ -858,6 +856,9 @@ copy-files:
 	# state files - sync
 	install -d -m 755 $(DESTDIR)/srv/salt/ceph/sync
 	install -m 644 srv/salt/ceph/sync/*.sls $(DESTDIR)/srv/salt/ceph/sync/
+	# state files - subvolume
+	install -d -m 755 $(DESTDIR)/srv/salt/ceph/subvolume
+	install -m 644 srv/salt/ceph/subvolume/*.sls $(DESTDIR)/srv/salt/ceph/subvolume/
 	install -d -m 755 $(DESTDIR)/srv/salt/ceph/setosdflags
 	install -m 644 srv/salt/ceph/setosdflags/*.sls $(DESTDIR)/srv/salt/ceph/setosdflags
 	install -d -m 755 $(DESTDIR)/srv/salt/ceph/setosdflags/requireosdrelease

deepsea.spec.in

@@ -183,7 +183,6 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
 %dir /srv/salt/ceph/migrate/nodes
 %dir /srv/salt/ceph/migrate/osds
 %dir /srv/salt/ceph/migrate/policy
-%dir /srv/salt/ceph/migrate/subvolume
 %dir /srv/salt/ceph/mines
 %dir /srv/salt/ceph/mines/files
 %dir /srv/salt/ceph/mon
@@ -384,6 +383,7 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
 %dir /srv/salt/ceph/tools/fio
 %dir /srv/salt/ceph/tools/fio/files
 %dir /srv/salt/ceph/sync
+%dir /srv/salt/ceph/subvolume
 %dir /srv/salt/ceph/sysctl
 %dir /srv/salt/ceph/sysctl/files
 %dir /srv/salt/ceph/setosdflags
@@ -540,7 +540,6 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
 %config /srv/salt/ceph/migrate/nodes/*.sls
 %config /srv/salt/ceph/migrate/osds/*.sls
 %config /srv/salt/ceph/migrate/policy/*.sls
-%config /srv/salt/ceph/migrate/subvolume/*.sls
 %config /srv/salt/ceph/mines/*.sls
 %config /srv/salt/ceph/mines/files/*.conf
 %config /srv/salt/ceph/mon/*.sls
@@ -718,6 +717,7 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
 %config /srv/salt/ceph/stage/services/*.sls
 %config /srv/salt/ceph/stage/validate/*.sls
 %config /srv/salt/ceph/sync/*.sls
+%config /srv/salt/ceph/subvolume/*.sls
 %config /srv/salt/ceph/sysctl/*.sls
 %config /srv/salt/ceph/sysctl/files/*.conf
 %config /srv/salt/ceph/setosdflags/*.sls

man/deepsea-commands.7

@@ -101,9 +101,6 @@ salt-run state.orch ceph.migrate.osds
 .RS
 .RE
 salt-run state.orch ceph.migrate.policy
-.RS
-.RE
-salt-run state.orch ceph.migrate.subvolume
 .PP
 salt-run state.orch ceph.purge
 .PP
@@ -188,7 +185,7 @@ Salt States are the essential building blocks for running a series of steps on a
 .BR sls
 file.
 .PP
-The states below can be run indepdently and are useful when debugging.  Nearly all states are part of a larger orchestration which may have prerequisites of other states.  Running these commands requires understanding what you are doing.
+The states below can be run independently and are useful when debugging.  Nearly all states are part of a larger orchestration which may have prerequisites of other states.  Running these commands requires understanding what you are doing.
 .PP
 For guidance, the Salt targets are listed as pseudo hostnames.  Some are intended to only run on the Salt master.  These targets are
 .BR master_minion.
@@ -284,6 +281,8 @@ salt 'rgw*' state.apply ceph.rgw.users
 .RE
 salt 'rgw*' state.apply ceph.rgw
 .PP
+salt 'mon*' state.apply ceph.subvolume
+.PP
 salt '*' state.apply ceph.time.ntp
 .RS
 .RE