From ee19a981b4d499f61f14a3b9890a7c1b2ed4a548 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Mon, 2 Mar 2015 10:33:24 +0000
Subject: Fix, remove SWIFT_ADMIN_USER and create swift-vars.yml

SWIFT_ADMIN_USER just seems like clutter to me
---
 openstack-swift.configure | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/openstack-swift.configure b/openstack-swift.configure
index b30b30c4..8e2bd207 100644
--- a/openstack-swift.configure
+++ b/openstack-swift.configure
@@ -17,10 +17,11 @@
 
 set -e
 
+ROOT="$1"
+
 cat << EOF > "$ROOT"/etc/openstack-swift-setup.sed
 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
@@ -34,3 +35,15 @@ sed -f "$ROOT"/etc/openstack-swift-setup.sed -i \
 
 ln -s "/etc/systemd/system/openstack-swift-setup.service" \
     "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-swift-setup.service"
+
+
+cat << EOF > "$ROOT"/usr/share/openstack/swift-vars.yml
+---
+STACK_ID: $STACK_ID
+KEYSTONE_INTERNAL_URL: $KEYSTONE_INTERNAL_URL
+SWIFT_ADMIN_PASSWORD: $SWIFT_ADMIN_PASSWORD
+MANAGEMENT_INTERFACE_IP_ADDRESS: $MANAGEMENT_INTERFACE_IP_ADDRESS
+SWIFT_ADMIN_URL: $SWIFT_ADMIN_URL
+SWIFT_INTERNAL_URL: $SWIFT_INTERNAL_URL
+SWIFT_PUBLIC_URL: $SWIFT_PUBLIC_URL
+EOF
-- 
cgit v1.2.1