splitting revision, using private-address

This commit is contained in:
Clint Byrum 2011-10-11 23:17:46 -07:00
parent d4f2379ce1
commit 9fd4b14ad2
3 changed files with 3 additions and 3 deletions

View File

@ -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
}

View File

@ -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

1
revision Normal file
View File

@ -0,0 +1 @@
65