From 0664605dcef8ff42a23ef94de3a601ef7befef51 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Tue, 3 Mar 2015 11:40:24 +0000 Subject: debug --- clusters/openstack-cluster.morph | 4 ++-- openstack-swift.configure | 4 ++++ 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" \ -- cgit v1.2.1