summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richardipsum@fastmail.co.uk>2015-04-10 10:26:06 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-04-10 14:59:46 (GMT)
commitae788d6bc5eb2625632d80c5eae3a8fd319b2bb5 (patch)
tree71bb21ccfdf44978c32d8e96308ec6d66f6b0931
parentadef59e7b4a3fef7bf84831583cc2086f8fcfa9c (diff)
downloaddefinitions-baserock/richardipsum/openstack-swift-act-II-scene-II-openstack-v5-base.tar.gz
Don't start swift storage services on controllerbaserock/richardipsum/openstack-swift-act-II-scene-II-openstack-v5-base
-rw-r--r--swift-storage.configure16
1 files changed, 11 insertions, 5 deletions
diff --git a/swift-storage.configure b/swift-storage.configure
index 9305c19..a7f264d 100644
--- a/swift-storage.configure
+++ b/swift-storage.configure
@@ -79,12 +79,18 @@ validate_non_empty "MANAGEMENT_INTERFACE_IP_ADDRESS" "$MANAGEMENT_INTERFACE_IP_A
mkdir -p "$ROOT/usr/lib/systemd/system/multi-user.target.wants" # ensure this exists before we make symlinks
-ln -s "/usr/lib/systemd/system/rsync.service" \
- "$ROOT/usr/lib/systemd/system/multi-user.target.wants/rsync.service"
-ln -s "/usr/lib/systemd/system/swift-storage.service" \
- "$ROOT/usr/lib/systemd/system/multi-user.target.wants/swift-storage.service"
+# A swift controller needs some of the storage config
+# but does not want any of the storage services enabled
ln -s "/usr/lib/systemd/system/swift-storage-setup.service" \
- "$ROOT/usr/lib/systemd/system/multi-user.target.wants/swift-storage-setup.service"
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/swift-storage-setup.service"
+
+if [[ $SWIFT_CONTROLLER = None ]]
+then
+ ln -s "/usr/lib/systemd/system/rsync.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/rsync.service"
+ ln -s "/usr/lib/systemd/system/swift-storage.service" \
+ "$ROOT/usr/lib/systemd/system/multi-user.target.wants/swift-storage.service"
+fi
# Build swift data structures (the rings)
/usr/bin/ansible-playbook -i hosts swift-build-rings.yml