diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-02 15:50:59 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-02 15:50:59 +0000 |
| commit | 9801084b32e8fe4d27a14403553fc61da1e17656 (patch) | |
| tree | e398d9f740f6f80d5c50854900da21edf007daec | |
| parent | 60948e9105680167c0c2004e5e70e5fa7f2592a6 (diff) | |
| download | definitions-9801084b32e8fe4d27a14403553fc61da1e17656.tar.gz | |
Make a unit for each type of node
swift-controller
and swift-storage
these units are enabled my specifying a flag in the cluster morph,
SWIFT_CONTROLLER and SWIFT_STORAGE
| -rw-r--r-- | clusters/openstack-cluster.morph | 2 | ||||
| -rw-r--r-- | openstack-swift.configure | 12 | ||||
| -rw-r--r-- | openstack/etc/systemd/system/openstack-swift-controller-setup.service (renamed from openstack/etc/systemd/system/openstack-swift-setup.service) | 0 |
3 files changed, 12 insertions, 2 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph index bf6e21c3..2bbc65fb 100644 --- a/clusters/openstack-cluster.morph +++ b/clusters/openstack-cluster.morph @@ -25,6 +25,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 HOSTNAME: onenode RABBITMQ_HOST: onenode RABBITMQ_PORT: 5672 diff --git a/openstack-swift.configure b/openstack-swift.configure index 1ab559a3..ee75d16a 100644 --- a/openstack-swift.configure +++ b/openstack-swift.configure @@ -33,9 +33,17 @@ sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \ "$ROOT"/etc/swift/container-server.conf "$ROOT"/etc/swift/object-server.conf -ln -s "/etc/systemd/system/openstack-swift-setup.service" \ - "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-setup.service" +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 +if $SWIFT_STORAGE +then + ln -s "/etc/systemd/system/openstack-swift-storage-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-storage-setup.service" +fi cat << EOF > "$ROOT"/usr/share/openstack/swift-vars.yml --- diff --git a/openstack/etc/systemd/system/openstack-swift-setup.service b/openstack/etc/systemd/system/openstack-swift-controller-setup.service index d43c43f2..d43c43f2 100644 --- a/openstack/etc/systemd/system/openstack-swift-setup.service +++ b/openstack/etc/systemd/system/openstack-swift-controller-setup.service |