summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-03 19:18:52 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-03-03 19:19:24 +0000
commit86102518b83064b5469e4c5639436d456dd6b879 (patch)
treec476782fc2f6ce920342235782d87e049f25722d
parent64ea6046119fffe3c5588e6bbf4e0b0e08408c1b (diff)
downloaddefinitions-86102518b83064b5469e4c5639436d456dd6b879.tar.gz
Add SWIFT_HASH_PATH vars to cluster morph
The deployer just needs to make these random unique values*, they must keep them secret and not lose them. So the cluster morph musn't be pushed to some public repo. * e.g. by running $ openssl rand -hex 10
-rw-r--r--clusters/openstack-cluster.morph2
-rw-r--r--openstack-swift.configure2
2 files changed, 4 insertions, 0 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index aa159bc6..cb91911a 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -25,6 +25,8 @@ systems:
SWIFT_STORAGE_DEVICES: [{ ip: '127.0.0.1', device: 'sdb1', weight: '100' }]
SWIFT_CONTROLLER: True
SWIFT_STORAGE: True
+ SWIFT_HASH_PATH_PREFIX: 041fc210e4e1d333ce1d
+ SWIFT_HASH_PATH_SUFFIX: 4d6f5362a356dda7fb7d
HOSTNAME: onenode
RABBITMQ_HOST: onenode
RABBITMQ_PORT: 5672
diff --git a/openstack-swift.configure b/openstack-swift.configure
index 40e20bb7..b6451f9e 100644
--- a/openstack-swift.configure
+++ b/openstack-swift.configure
@@ -24,6 +24,8 @@ s/##STACK_ID/$STACK_ID/g
s/##KEYSTONE_INTERNAL_URL##/$KEYSTONE_INTERNAL_URL/g
s/##SWIFT_ADMIN_PASSWORD##/$SWIFT_ADMIN_PASSWORD/g
s/##MANAGEMENT_INTERFACE_IP_ADDRESS##/$MANAGEMENT_INTERFACE_IP_ADDRESS/g
+s/##SWIFT_HASH_PATH_PREFIX##/$SWIFT_HASH_PATH_PREFIX/g
+s/##SWIFT_HASH_PATH_SUFFIX##/$SWIFT_HASH_PATH_SUFFIX/g
EOF
sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \