summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-05 12:31:02 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-05 12:41:08 +0000
commit528a0ab452409832e4251bb8827d3b64bc31f727 (patch)
treec9f00b36c2d25496021d62cb86cebebde56c9787
parent9274503b89911058b363579da0c8d730d7ad65ba (diff)
downloaddefinitions-528a0ab452409832e4251bb8827d3b64bc31f727.tar.gz
openstack-swift.configure: everything in its right place
-rw-r--r--openstack-swift.configure16
1 files changed, 9 insertions, 7 deletions
diff --git a/openstack-swift.configure b/openstack-swift.configure
index 0157549b..50c65e97 100644
--- a/openstack-swift.configure
+++ b/openstack-swift.configure
@@ -39,18 +39,20 @@ sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \
if [[ "$SWIFT_CONTROLLER" = True ]]
then
# collapse into loop?
- ln -sv "/etc/systemd/system/openstack-swift-controller-setup.service" \
- "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-controller-setup.service"
+ ln -sv "/usr/lib/systemd/system/openstack-swift-controller-setup.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/openstack-swift-controller-setup.service"
ln -sv "/usr/lib/systemd/system/memcached.service" \
"$ROOT/usr/lib/systemd/system/multi-user.target.wants/memcached.service"
- ln -sv "/usr/lib/systemd/system/rsync.service" \
- "$ROOT/usr/lib/systemd/system/multi-user.target.wants/rsync.service"
-fi
+ ln -sv "/usr/lib/systemd/system/openstack-swift-proxy.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/openstack-swift-proxy.service"
+ fi
if [[ "$SWIFT_STORAGE" = True ]]
then
- ln -sv "/etc/systemd/system/openstack-swift-storage-setup.service" \
- "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-storage-setup.service"
+ ln -sv "/usr/lib/systemd/system/rsync.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/rsync.service"
+ ln -sv "/usr/lib/systemd/system/openstack-swift-storage.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/openstack-swift-storage.service"
fi
cat << EOF > "$ROOT"/usr/share/openstack/swift-vars.yml