openstack
/
heat
Code Issues Proposed changes

doc: fix issue in template_guide/software_deployment 

using:

user_data_format: RAW

for OS::Heat::SoftwareConfig causes error during provisioning

Change-Id: I95be8bcb350603d72f598e4c70d9ada847d7c0fb
This commit is contained in:
Lukas Bednar 2016-05-13 18:01:17 +02:00
parent 69251cdcbd
commit 832f15b9e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/template_guide/software_deployment.rst
View File

@ -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}