From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 2 Sep 2013 12:00:47 +0000 (+0000)
Subject: Merge "EC2token middleware implement multi-cloud auth"
X-Git-Tag: 2014.1~90
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ce9f80014ef375997b2e851da81701d033ae524d;p=openstack-build%2Fheat-build.git

Merge "EC2token middleware implement multi-cloud auth"
---

ce9f80014ef375997b2e851da81701d033ae524d
diff --cc etc/heat/heat.conf.sample
index 83badfd8,14f313fa..90e608f5
--- a/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]