Updated openstack/openstack
Project: openstack/nova  2b5a4923eeae7cfc062474af685e6e626d0345ba

Adds more policy control to cells ext

Allow create,delete,update and sync_instances to
have fine grained policy control.

UpgradeImpact
DocImpact

Change-Id: I2e32ae2f37d3b599585d25535c79eecf6485b462
Closes-Bug: 1335901
Updated openstack/openstack
Project: openstack-dev/devstack  d8b04c2a747fd91592a946ee3e93f69282b94d20

Add SERVICE_TOKEN to the sample local.conf

I expect the sample local.conf file to contain all the required
variables. However, after copying samples/local.conf, the stack.sh
script still asks for SERVICE_TOKEN.

This commit adds the SERVICE_TOKEN definition to local.conf so that a
new user can just copy samples/local.conf, edit it, and have a running
stack.sh without the mild annoyance of having more variables to set.

Change-Id: Ifb163c7f67c80037d8b10458f2df458a20da4667