From: Steve Baker Date: Fri, 12 Apr 2013 22:48:24 +0000 (+1000) Subject: Move ec2token defaults from paste.ini to .conf X-Git-Tag: 2014.1~697^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=28b60667e259e433b3344ede78ee2eb752de273d;p=openstack-build%2Fheat-build.git Move ec2token defaults from paste.ini to .conf paste.ini files can now be considered not user-editable (in normal circumstances) Change-Id: Ia2a6d784ed2fad009de9e77717e6e0dc00c5e2f4 --- diff --git a/etc/heat/heat-api-cfn-paste.ini b/etc/heat/heat-api-cfn-paste.ini index 5e8fede7..3f496eed 100644 --- a/etc/heat/heat-api-cfn-paste.ini +++ b/etc/heat/heat-api-cfn-paste.ini @@ -24,8 +24,6 @@ paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory [filter:ec2authtoken] paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory -auth_uri = http://127.0.0.1:5000/v2.0 -keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens [filter:authtoken] paste.filter_factory = heat.common.auth_token:filter_factory diff --git a/etc/heat/heat-api-cfn.conf b/etc/heat/heat-api-cfn.conf index a5eea5fb..06e66814 100644 --- a/etc/heat/heat-api-cfn.conf +++ b/etc/heat/heat-api-cfn.conf @@ -40,3 +40,7 @@ auth_uri = http://127.0.0.1:5000/v2.0 admin_tenant_name = service admin_user = heat admin_password = verybadpass + +[ec2authtoken] +auth_uri = http://127.0.0.1:5000/v2.0 +keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens diff --git a/etc/heat/heat-api-cloudwatch-paste.ini b/etc/heat/heat-api-cloudwatch-paste.ini index 77b6968a..b71d7ed9 100644 --- a/etc/heat/heat-api-cloudwatch-paste.ini +++ b/etc/heat/heat-api-cloudwatch-paste.ini @@ -24,8 +24,6 @@ paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory [filter:ec2authtoken] paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory -auth_uri = http://127.0.0.1:5000/v2.0 -keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens [filter:authtoken] paste.filter_factory = heat.common.auth_token:filter_factory diff --git a/etc/heat/heat-api-cloudwatch.conf b/etc/heat/heat-api-cloudwatch.conf index 25761bce..e582631d 100644 --- a/etc/heat/heat-api-cloudwatch.conf +++ b/etc/heat/heat-api-cloudwatch.conf @@ -38,3 +38,7 @@ auth_uri = http://127.0.0.1:5000/v2.0 admin_tenant_name = service admin_user = heat admin_password = verybadpass + +[ec2authtoken] +auth_uri = http://127.0.0.1:5000/v2.0 +keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens