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 5e8fede7058f2388c1e049a3549cebec22fda44a..3f496eeda7ab2a6e7aa6b2a09889bb2ee4d69f0f 100644 (file)
--- 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 a5eea5fbd5a0b21804b5d990c5abe8cd027e0bea..06e66814f4e72a7c4e00a555d2b2ede98efd1249 100644 (file)
--- 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 77b6968ab5a274dfee3a9c9c87217dd8d4832d32..b71d7ed9f225b55fbaf6a9d77cdfe94e11f50334 100644 (file)
--- 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 25761bce39550fd760e08306731a52e1f171589f..e582631d06465ed884c54673ddb9f14062cf076a 100644 (file)
--- 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