x
/
cloud-init
Code Issues Proposed changes

docs: fix disk-setup to reference 'table_type'

This commit is contained in:
Scott Moser 2014-08-22 10:43:02 -04:00
parent 09c9fe119e
commit efe103f1d9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
- default settings: fix typo resulting in OpenStack and GCE not working - default settings: fix typo resulting in OpenStack and GCE not working
unless config explicitly provided (LP: #1329583) [Garrett Holmstrom]) unless config explicitly provided (LP: #1329583) [Garrett Holmstrom])
- fix rendering resolv.conf if no 'options' are provided (LP: #1328953) - fix rendering resolv.conf if no 'options' are provided (LP: #1328953)
- docs: fix disk-setup to reference 'table_type' [Rail Aliiev] (LP: #1313114)
0.7.5: 0.7.5:
- open 0.7.5 - open 0.7.5
- Add a debug log message around import failures - Add a debug log message around import failures

16
doc/examples/cloud-config-disk-setup.txt
View File

@ -7,7 +7,7 @@
disk_setup: disk_setup:
ephmeral0: ephmeral0:
type: 'mbr' table_type: 'mbr'
layout: True layout: True
overwrite: False overwrite: False
@ -23,7 +23,7 @@ fs_setup:
device_aliases: {'ephemeral0': '/dev/sdb'} device_aliases: {'ephemeral0': '/dev/sdb'}
disk_setup: disk_setup:
ephemeral0: ephemeral0:
type: mbr table_type: mbr
layout: True layout: True
overwrite: False overwrite: False
@ -40,7 +40,7 @@ fs_setup:
device_aliases: {'ephemeral0': '/dev/sdb'} device_aliases: {'ephemeral0': '/dev/sdb'}
disk_setup: disk_setup:
ephemeral0: ephemeral0:
type: mbr table_type: mbr
layout: False layout: False
overwrite: False overwrite: False
@ -63,10 +63,10 @@ fs_setup:
disk_setup: disk_setup:
ephmeral0: ephmeral0:
type: 'mbr' table_type: 'mbr'
layout: 'auto' layout: 'auto'
/dev/xvdh: /dev/xvdh:
type: 'mbr' table_type: 'mbr'
layout: layout:
- 33 - 33
- [33, 82] - [33, 82]
@ -79,7 +79,7 @@ disk_setup:
# The general format is: # The general format is:
# disk_setup: # disk_setup:
# <DEVICE>: # <DEVICE>:
# type: 'mbr' # table_type: 'mbr'
# layout: <LAYOUT|BOOL> # layout: <LAYOUT|BOOL>
# overwrite: <BOOL> # overwrite: <BOOL>
# #
@ -96,7 +96,7 @@ disk_setup:
# Note: At this time, there is no handling or setup of # Note: At this time, there is no handling or setup of
# device mapper targets. # device mapper targets.
# #
# type=<TYPE>: Currently the following are supported: # table_type=<TYPE>: Currently the following are supported:
# 'mbr': default and setups a MS-DOS partition table # 'mbr': default and setups a MS-DOS partition table
# #
# Note: At this time only 'mbr' partition tables are allowed. # Note: At this time only 'mbr' partition tables are allowed.
@ -116,7 +116,7 @@ disk_setup:
# partition having a swap label, taking 1/3 of the disk space # partition having a swap label, taking 1/3 of the disk space
# and the remainder being used as the second partition. # and the remainder being used as the second partition.
# /dev/xvdh': # /dev/xvdh':
# type: 'mbr' # table_type: 'mbr'
# layout: # layout:
# - [33,82] # - [33,82]
# - 66 # - 66