diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-01 15:59:51 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-01 15:59:51 +0000 |
commit | 1c44ea097ef875d9fd28d5cb3752da59bfbf71b2 (patch) | |
tree | 20ae8e52847c6002d00a7e39cbf8e28a2779bcc1 | |
parent | 24bb9cdd0184536b2c66e3bcbd2b9738b8ed1b87 (diff) | |
download | definitions-1c44ea097ef875d9fd28d5cb3752da59bfbf71b2.tar.gz |
Add MANAGEMENT_INTERFACE_IP_ADDRESS variable
Ideally this would be inferred from the network information provided in the
cluster, but at the moment the means to do that aren't available so we're
forced to have the deployer provide this address.
Note that this address is the ip for *this* node (the node we are deploying)
that sits on the management network.
-rw-r--r-- | clusters/openstack-cluster.morph | 1 | ||||
-rw-r--r-- | openstack-swift.configure | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph index 26f63107..73d8cb86 100644 --- a/clusters/openstack-cluster.morph +++ b/clusters/openstack-cluster.morph @@ -17,6 +17,7 @@ systems: COMPUTE_NODE_IPS: 127.0.0.1 OBJECT_STORAGE_NODE_IPS: 127.0.0.1 BLOCK_STORAGE_NODE_IPS: 127.0.0.1 + MANAGEMENT_INTERFACE_IP_ADDRESS: 127.0.0.1 HOSTNAME: onenode RABBITMQ_HOST: onenode RABBITMQ_PORT: 5672 diff --git a/openstack-swift.configure b/openstack-swift.configure index 2bcf1d62..b30b30c4 100644 --- a/openstack-swift.configure +++ b/openstack-swift.configure @@ -22,10 +22,15 @@ s/##STACK_ID/$STACK_ID/g s/##KEYSTONE_INTERNAL_URL##/$KEYSTONE_INTERNAL_URL/g s/##SWIFT_ADMIN_USER##/$SWIFT_ADMIN_USER/g s/##SWIFT_ADMIN_PASSWORD##/$SWIFT_ADMIN_PASSWORD/g +s/##MANAGEMENT_INTERFACE_IP_ADDRESS##/$MANAGEMENT_INTERFACE_IP_ADDRESS/g EOF sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \ "$ROOT"/etc/swift/proxy-server.conf + "$ROOT"/etc/rsyncd.conf + "$ROOT"/etc/swift/account-server.conf + "$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" |