From 832f15b9e41d3d0d52efaaabc5cbec5ba516b287 Mon Sep 17 00:00:00 2001 From: Lukas Bednar Date: Fri, 13 May 2016 18:01:17 +0200 Subject: [PATCH] doc: fix issue in template_guide/software_deployment using: user_data_format: RAW for OS::Heat::SoftwareConfig causes error during provisioning Change-Id: I95be8bcb350603d72f598e4c70d9ada847d7c0fb --- doc/source/template_guide/software_deployment.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst index bfc74a1018..6c0a3db85a 100644 --- a/doc/source/template_guide/software_deployment.rst +++ b/doc/source/template_guide/software_deployment.rst @@ -354,7 +354,7 @@ represented by text scripts, for example: type: OS::Nova::Server properties: # flavor, image etc - user_data_format: RAW + user_data_format: SOFTWARE_CONFIG user_data: {get_resource: boot_script} The resource :ref:`OS::Heat::CloudConfig` allows Cloud-init_ cloud-config to @@ -383,7 +383,7 @@ valid cloud-config are done. type: OS::Nova::Server properties: # flavor, image etc - user_data_format: RAW + user_data_format: SOFTWARE_CONFIG user_data: {get_resource: boot_config} The resource :ref:`OS::Heat::MultipartMime` allows multiple @@ -431,7 +431,7 @@ resources to be combined into a single Cloud-init_ multi-part message: type: OS::Nova::Server properties: # flavor, image etc - user_data_format: RAW + user_data_format: SOFTWARE_CONFIG user_data: {get_resource: server_init}