summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-03 11:40:24 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-03 11:40:24 +0000
commit0664605dcef8ff42a23ef94de3a601ef7befef51 (patch)
treed38dbd1fc82336cca4bc28273c29bd2a17d7f2cf
parente50349845b34c7ac5ba9836f478caab60b8aaa42 (diff)
downloaddefinitions-0664605dcef8ff42a23ef94de3a601ef7befef51.tar.gz
debug
-rw-r--r--clusters/openstack-cluster.morph4
-rw-r--r--openstack-swift.configure4
2 files changed, 6 insertions, 2 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index 202df1fa..aa346a4d 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -23,8 +23,8 @@ systems:
SWIFT_REPLICAS: 3
SWIFT_MIN_PART_HOURS: 1
SWIFT_STORAGE_DEVICES: { ip: '127.0.0.1', device: 'sdb1', weight: '100' }
- SWIFT_CONTROLLER: true
- SWIFT_STORAGE: true
+ SWIFT_CONTROLLER: false
+ SWIFT_STORAGE: false
HOSTNAME: onenode
RABBITMQ_HOST: onenode
RABBITMQ_PORT: 5672
diff --git a/openstack-swift.configure b/openstack-swift.configure
index 5e927c13..6c959945 100644
--- a/openstack-swift.configure
+++ b/openstack-swift.configure
@@ -33,12 +33,16 @@ sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \
"$ROOT"/etc/swift/object-server.conf
# "$ROOT"/etc/rsyncd.conf \
+echo "SWIFT_CONTROLLER: $SWIFT_CONTROLLER"
+
if $SWIFT_CONTROLLER
then
ln -s "/etc/systemd/system/openstack-swift-controller-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-controller-setup.service"
fi
+echo "SWIFT_STORAGE: $SWIFT_STORAGE"
+
if $SWIFT_STORAGE
then
ln -s "/etc/systemd/system/openstack-swift-storage-setup.service" \