From ce07ddb75982fdf48e62fb17f6b43ba13b2bae0f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 19 Jul 2013 14:38:13 +1200 Subject: [PATCH] Configure standalone pipelines for cfn and cloudwatch. This allows waitconditions and cloud watch data to authenticate using just the ec2token middleware. Stacks have been successfully launched with a standalone heat onto an external grizzly openstack, including working waitconditions and watch data. This means that currently when in standalone mode, heat-cfn cannot authenticate since it defaults to auth strategy keystone (and it appears that auth strategy ec2 signing has not been implemented yet). This case is sufficiently obscure that it most likely won't affect anyone at this stage. Implements blueprint heat-standalone Change-Id: I7d096b11e70c234d0b2322c93bf5f4d4e6b01b4f --- etc/heat/api-paste.ini | 10 ++++++++++ etc/heat/heat-api-cfn.conf | 4 ++++ etc/heat/heat-api-cloudwatch.conf | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/etc/heat/api-paste.ini b/etc/heat/api-paste.ini index 8afcd66bd0..72e5e579a4 100644 --- a/etc/heat/api-paste.ini +++ b/etc/heat/api-paste.ini @@ -26,10 +26,20 @@ pipeline = versionnegotiation context custombackendauth apiv1app [pipeline:heat-api-cfn] pipeline = cfnversionnegotiation ec2authtoken authtoken context apicfnv1app +# heat-api-cfn pipeline for standalone heat +# relies exclusively on authenticating with ec2 signed requests +[pipeline:heat-api-cfn-standalone] +pipeline = cfnversionnegotiation ec2authtoken context apicfnv1app + # heat-api-cloudwatch pipeline [pipeline:heat-api-cloudwatch] pipeline = versionnegotiation ec2authtoken authtoken context apicwapp +# heat-api-cloudwatch pipeline for standalone heat +# relies exclusively on authenticating with ec2 signed requests +[pipeline:heat-api-cloudwatch-standalone] +pipeline = versionnegotiation ec2authtoken context apicwapp + [app:apiv1app] paste.app_factory = heat.common.wsgi:app_factory heat.app_factory = heat.api.openstack.v1:API diff --git a/etc/heat/heat-api-cfn.conf b/etc/heat/heat-api-cfn.conf index 06e66814f4..35d0a21ea3 100644 --- a/etc/heat/heat-api-cfn.conf +++ b/etc/heat/heat-api-cfn.conf @@ -29,6 +29,10 @@ use_syslog = False rpc_backend=heat.openstack.common.rpc.impl_qpid +# Uncomment to deploy different flavor of heat-api-cfn pipeline: +# [paste_deploy] +# flavor = standalone + [keystone_authtoken] auth_host = 127.0.0.1 auth_port = 35357 diff --git a/etc/heat/heat-api-cloudwatch.conf b/etc/heat/heat-api-cloudwatch.conf index e582631d06..b95b016d89 100644 --- a/etc/heat/heat-api-cloudwatch.conf +++ b/etc/heat/heat-api-cloudwatch.conf @@ -27,6 +27,10 @@ bind_port = 8003 rpc_backend=heat.openstack.common.rpc.impl_qpid +# Uncomment to deploy different flavor of heat-api-cloudwatch pipeline: +# [paste_deploy] +# flavor = standalone + [keystone_authtoken] auth_host = 127.0.0.1 auth_port = 35357