From 9fd4b14ad2114f6c94c33189cae51fe9140822c8 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@ubuntu.com>
Date: Tue, 11 Oct 2011 23:17:46 -0700
Subject: [PATCH] splitting revision, using private-address

---
 hooks/swift-proxy-relations | 4 ++--
 metadata.yaml               | 1 -
 revision                    | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 revision

diff --git a/hooks/swift-proxy-relations b/hooks/swift-proxy-relations
index b01cd09..5214624 100755
--- a/hooks/swift-proxy-relations
+++ b/hooks/swift-proxy-relations
@@ -106,7 +106,7 @@ function proxy_changed {
   chown -R swift:swift /etc/swift
   chown -R www-data $WWW_DIR
 
-  relation-set update_url="http://$(hostname -f)/swift-rings/$stamp"
+  relation-set update_url="http://$(unit-get private-address)/swift-rings/$stamp"
   relation-set swift_hash=$(cat $SWIFT_HASH_FILE)
 
   swift-init proxy status || swift-init proxy start
@@ -129,7 +129,7 @@ function object-store_joined {
   USER=$(cat /etc/swift/proxy-server.conf | grep user_system_root | awk '{ print $1 }')
   USER=${USER##*_}
   PASSWORD=$(cat /etc/swift/proxy-server.conf | grep user_system_root | cut -d= -f2 | awk '{ print $1 }')
-  URL=https://$(hostname -f):8080/auth/v1.0
+  URL=https://$(unit-get private-address):8080/auth/v1.0
   relation-set user=$USER password=$PASSWORD url=$URL
 }
 
diff --git a/metadata.yaml b/metadata.yaml
index 4ad78fc..6813a99 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,6 +1,5 @@
 ensemble: formula
 name: swift-proxy
-revision: 64
 summary: "Swift proxy node"
 description: |
   Swift is a distributed virtual object store. This formula deploys the proxy node
diff --git a/revision b/revision
new file mode 100644
index 0000000..1479e19
--- /dev/null
+++ b/revision
@@ -0,0 +1 @@
+65