From: James Slagle <jslagle@redhat.com>
Date: Thu, 17 Jul 2014 15:15:09 +0000 (-0400)
Subject: Add user_data_format
X-Git-Tag: opnfv-6.0.0~2795^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=55959c195bd562f6b357c37f7db2dcaaeb9cf26c;p=apex-tripleo-heat-templates.git

Add user_data_format

user_data_format must be set to SOFTWARE_CONFIG on instances of
OS::Nova::Server where there are deployments. Corrects the following
error:

ERROR: Resource BlockStorage0's property user_data_format should be set
to SOFTWARE_CONFIG since there are software deployments on it.

Change-Id: Iba29588374980098d71585ff1bf26ad914a6711c
---

diff --git a/block-storage.yaml b/block-storage.yaml
index 55a629a0..524dda79 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -22,6 +22,7 @@ Resources:
         {Ref: BlockStorageImage}
       flavor: {Ref: OvercloudBlockStorageFlavor}
       key_name: {Ref: KeyName}
+      user_data_format: SOFTWARE_CONFIG
   BlockStorage0Deployment:
     Type: OS::Heat::StructuredDeployment
     Properties: