worker/provisioner: cannot restart cleanly due to hard dependency on api server

The provisioner cannot restart cleanly as it cannot come up without the api server. However when the provisioner restarts, the api server restarts and the two race to see who comes up first.

2013-09-03 01:46:09 INFO juju runner.go:245 worker: restarting "state" in 3s
2013-09-03 01:46:11 INFO juju runner.go:253 worker: start "api"
2013-09-03 01:46:11 INFO juju apiclient.go:106 state/api: dialing "wss://localhost:17070/"
2013-09-03 01:46:11 ERROR juju apiclient.go:111 state/api: websocket.Dial wss://localhost:17070/: dial tcp 127.0.0.1:17070: connection refused
2013-09-03 01:46:11 ERROR juju runner.go:211 worker: exited "api": websocket.Dial wss://localhost:17070/: dial tcp 127.0.0.1:17070: connection refused
2013-09-03 01:46:11 INFO juju runner.go:245 worker: restarting "api" in 3s
2013-09-03 01:46:12 INFO juju runner.go:253 worker: start "state"
2013-09-03 01:46:12 INFO juju.state open.go:68 opening state; mongo addresses: ["localhost:37017"]; entity "machine-0"
2013-09-03 01:46:12 INFO juju.state open.go:106 connection established
2013-09-03 01:46:12 INFO juju runner.go:253 worker: start "lxc-provisioner"
2013-09-03 01:46:12 INFO juju runner.go:253 worker: start "environ-provisioner"
2013-09-03 01:46:12 INFO juju runner.go:253 worker: start "firewaller"
2013-09-03 01:46:12 INFO juju runner.go:253 worker: start "apiserver"
2013-09-03 01:46:12 INFO juju apiserver.go:37 state/api: listening on "[::]:17070"

http://paste.ubuntu.com/6057341/

Eventually the api server will start before the provisioner, but it causes extended delays adding new units/machines.