From 99a1e7525015f4e710e3de6e041cffcd264153cf Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Wed, 31 Jul 2013 14:07:05 -0700
Subject: Migrate from cfn-hup to os-collect-config

Os-collect-config is meant to replace cfn-hup from heat-cfntools. It
allows pulling from multiple metadata sources and runs continuously.

Fixes bug #1211289

Change-Id: Ia4e9127fb79048bd1022b32a37272f8463a774ae
---
 nova-compute-instance.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'nova-compute-instance.yaml')

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 0da26e65..e93c314c 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -71,16 +71,14 @@ Resources:
       KeyName: {Ref: KeyName}
     Metadata:
       OpenStack::ImageBuilder::Elements: [ nova-compute ]
-      heat: 
-        access_key_id:
-          Ref: ComputeKey
-        secret_key:
-          Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: NovaCompute0
+      os-collect-config:
+        cfn:
+          access_key_id:
+            Ref: ComputeKey
+          secret_access_key:
+            Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
+          stack_name: {Ref: 'AWS::StackName'}
+          path: [ NovaCompute0.Metadata ]
       nova:
         compute_driver: {Ref: NovaComputeDriver}
         compute_libvirt_type: {Ref: NovaComputeLibvirtType}
-- 
cgit 1.2.3-korg