From: Derek Higgins <derekh@redhat.com>
Date: Tue, 15 Oct 2013 21:53:23 +0000 (+0100)
Subject: Move os-collect-config section
X-Git-Tag: opnfv-6.0.0~2924
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ee0a83ec16d464472d0e6580272e6944530f4f9a;p=apex-tripleo-heat-templates.git

Move os-collect-config section

All these sections are in alphabetical order except this one.

Change-Id: Id0586b5ba11e3c00e36397c7e2cd46e0c8cae292
---

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 1f0442e0..97c55df8 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -187,17 +187,6 @@ Resources:
                  - networks
         service-password:
           Ref: GlancePassword
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: Key
-          path: notcomputeConfig.Metadata
-          secret_access_key:
-            Fn::GetAtt:
-            - Key
-            - SecretAccessKey
-          stack_name:
-            Ref: AWS::StackName
       heat:
         admin_password:
           Ref: HeatPassword
@@ -298,6 +287,17 @@ Resources:
         metadata-proxy: true
         service-password:
           Ref: NovaPassword
+      os-collect-config:
+        cfn:
+          access_key_id:
+            Ref: Key
+          path: notcomputeConfig.Metadata
+          secret_access_key:
+            Fn::GetAtt:
+            - Key
+            - SecretAccessKey
+          stack_name:
+            Ref: AWS::StackName
       rabbit:
         host:
           Fn::Select: