Merge pull request #2436 from johanneswuerbach/gateway-race

fix(gateway): Removed unrecoverable state

Author: carmstrong

store/gateway/bin/boot

@@ -83,14 +83,16 @@ else
 fi
 
 if ! radosgw-admin user info --uid=deis >/dev/null 2>&1 ; then
-  radosgw-admin user create --uid=deis --display-name="Deis" >/etc/ceph/user.json
-  # store the access key and secret key for consumption by other services
-  ACCESS_KEY=`cat /etc/ceph/user.json | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj["keys"][0]["access_key"]);' | tr -d '"'`
-  SECRET_KEY=`cat /etc/ceph/user.json | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj["keys"][0]["secret_key"]);' | tr -d '"'`
-  etcdctl --no-sync -C $ETCD set $ETCD_PATH/accessKey ${ACCESS_KEY} >/dev/null
-  etcdctl --no-sync -C $ETCD set $ETCD_PATH/secretKey ${SECRET_KEY} >/dev/null
+  radosgw-admin user create --uid=deis --display-name="Deis"
 fi
 
+radosgw-admin user info --uid=deis >/etc/ceph/user.json
+# store the access key and secret key for consumption by other services
+ACCESS_KEY=`cat /etc/ceph/user.json | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj["keys"][0]["access_key"]);' | tr -d '"'`
+SECRET_KEY=`cat /etc/ceph/user.json | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj["keys"][0]["secret_key"]);' | tr -d '"'`
+etcdctl --no-sync -C $ETCD set $ETCD_PATH/accessKey ${ACCESS_KEY} >/dev/null
+etcdctl --no-sync -C $ETCD set $ETCD_PATH/secretKey ${SECRET_KEY} >/dev/null
+
 # spawn the service in the background
 echo "Starting RADOS gateway..."
 /etc/init.d/radosgw start