summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-26 14:31:30 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-26 14:31:30 +0000
commit0e6b93fe2ae75e1cd6532deb00d92ef8734ff94a (patch)
treebd06e22c456446baba10ffceb767f4794bbe520a
parent7b58e4e75b8dc9df0992ce39e2884bb953fbcfe2 (diff)
downloaddefinitions-0e6b93fe2ae75e1cd6532deb00d92ef8734ff94a.tar.gz
Set up the cinder LVM backends out of the cinder-setup service
-rw-r--r--openstack-cinder.configure3
-rw-r--r--openstack/etc/systemd/system/openstack-cinder-configure-backends.service3
-rw-r--r--openstack/usr/share/openstack/openstack-cinder-setup4
3 files changed, 5 insertions, 5 deletions
diff --git a/openstack-cinder.configure b/openstack-cinder.configure
index a99eaa07..7e252bf7 100644
--- a/openstack-cinder.configure
+++ b/openstack-cinder.configure
@@ -48,3 +48,6 @@ ln -sf "/usr/lib/systemd/system/lvm2-lvmetad.service" \
ln -sf "/etc/systemd/system/openstack-cinder-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service"
+
+ln -sf "/etc/systemd/system/openstack-cinder-configure-backends.service" \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-configure-backends.service"
diff --git a/openstack/etc/systemd/system/openstack-cinder-configure-backends.service b/openstack/etc/systemd/system/openstack-cinder-configure-backends.service
index 46284636..572f6b8d 100644
--- a/openstack/etc/systemd/system/openstack-cinder-configure-backends.service
+++ b/openstack/etc/systemd/system/openstack-cinder-configure-backends.service
@@ -1,6 +1,7 @@
[Unit]
Description=Configure LVM Backends for Cinder
-After=cinder-volume.service cinder-api.service
+Wants=openstack-cinder-setup.service openstack-cinder-api.service openstack-cinder-volume.service
+After=openstack-keystone-setup.service openstack-cinder-setup.service openstack-cinder-api.service openstack-cinder-volume.service
[Service]
Type=oneshot
diff --git a/openstack/usr/share/openstack/openstack-cinder-setup b/openstack/usr/share/openstack/openstack-cinder-setup
index fc798fe9..0c871fbe 100644
--- a/openstack/usr/share/openstack/openstack-cinder-setup
+++ b/openstack/usr/share/openstack/openstack-cinder-setup
@@ -115,7 +115,6 @@ systemctl start openstack-cinder-api
systemctl start openstack-cinder-scheduler
systemctl start openstack-cinder-volume
systemctl start openstack-cinder-backup
-systemctl start openstack-cinder-configure-backends
# Create the links to run nova services when system start next times.
ln -sf "/etc/systemd/system/openstack-cinder-api.service" \
@@ -127,7 +126,4 @@ ln -sf "/etc/systemd/system/openstack-cinder-scheduler.service" \
ln -sf "/etc/systemd/system/openstack-cinder-volume.service" \
"/etc/systemd/system/multi-user.target.wants/openstack-cinder-volume.service"
-ln -sf "/etc/systemd/system/openstack-cinder-backup.service" \
- "/etc/systemd/system/multi-user.target.wants/openstack-cinder-backup.service"
-
exit 0