Merge "EC2token middleware implement multi-cloud auth"

diff --cc etc/heat/heat.conf.sample
index 83badfd87b0ff5818a1f053904ffe87530daa61e,14f313fa5d60ffa3a830c198267ec60b9e80abf3..90e608f5aff20a34d065c817b115e15edf404e65
--- 1/etc/heat/heat.conf.sample
--- 2/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
@@@ -492,92 -523,29 +492,100 @@@
  # Authentication Endpoint URI (string value)
  #auth_uri=<None>
  
+ # Allow orchestration of multiple clouds (boolean value)
+ #multi_cloud=false
+ 
+ # Allowed keystone endpoints for auth_uri when multi_cloud is
+ # enabled. At least one endpoint needs to be specified. (list
+ # value)
+ #allowed_auth_uris=
+ 
  
 -[matchmaker_redis]
 +[heat_api_cloudwatch]
  
  #
 -# Options defined in heat.openstack.common.rpc.matchmaker_redis
 +# Options defined in heat.common.wsgi
  #
  
 -# Host to locate redis (string value)
 -#host=127.0.0.1
 +# Address to bind the server.  Useful when selecting a
 +# particular network interface. (string value)
 +#bind_host=0.0.0.0
  
 -# Use this port to connect to redis host. (integer value)
 -#port=6379
 +# The port on which the server will listen. (integer value)
 +#bind_port=8003
  
 -# Password for Redis server. (optional) (string value)
 -#password=<None>
 +# Number of backlog requests to configure the socket with
 +# (integer value)
 +#backlog=4096
 +
 +# Location of the SSL Certificate File to use for SSL mode
 +# (string value)
 +#cert_file=<None>
 +
 +# Location of the SSL Key File to use for enabling SSL mode
 +# (string value)
 +#key_file=<None>
 +
 +# Number of workers for Heat service (integer value)
 +#workers=0
 +
 +
 +[heat_api]
 +
 +#
 +# Options defined in heat.common.wsgi
 +#
 +
 +# Address to bind the server.  Useful when selecting a
 +# particular network interface. (string value)
 +#bind_host=0.0.0.0
 +
 +# The port on which the server will listen. (integer value)
 +#bind_port=8004
 +
 +# Number of backlog requests to configure the socket with
 +# (integer value)
 +#backlog=4096
 +
 +# Location of the SSL Certificate File to use for SSL mode
 +# (string value)
 +#cert_file=<None>
 +
 +# Location of the SSL Key File to use for enabling SSL mode
 +# (string value)
 +#key_file=<None>
 +
 +# Number of workers for Heat service (integer value)
 +#workers=0
 +
 +
 +[heat_api_cfn]
 +
 +#
 +# Options defined in heat.common.wsgi
 +#
 +
 +# Address to bind the server.  Useful when selecting a
 +# particular network interface. (string value)
 +#bind_host=0.0.0.0
 +
 +# The port on which the server will listen. (integer value)
 +#bind_port=8000
 +
 +# Number of backlog requests to configure the socket with
 +# (integer value)
 +#backlog=4096
 +
 +# Location of the SSL Certificate File to use for SSL mode
 +# (string value)
 +#cert_file=<None>
 +
 +# Location of the SSL Key File to use for enabling SSL mode
 +# (string value)
 +#key_file=<None>
 +
 +# Number of workers for Heat service (integer value)
 +#workers=0
  
  
  [auth_password]