Merge ~szeestraten/cloud-init:doc-fix-disk-setup-examples into cloud-init:master

Proposed by Sandor Zeestraten
Status: Merged
Merged at revision: fc89390408991021ea90885cc145afd7c1ed6069
Proposed branch: ~szeestraten/cloud-init:doc-fix-disk-setup-examples
Merge into: cloud-init:master
Diff against target: 20 lines (+4/-4)
1 file modified
doc/examples/cloud-config-disk-setup.txt (+4/-4)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+327274@code.launchpad.net

Description of the change

doc: fix disk setup example table_type options

This fixes the disk setup example doc which specifies that the only
currently supported table_type option is 'mbr' by adding the 'gpt'
option which got supported as of 0.7.7.

LP: #1703789

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:fe5cc4eb684bd93d434eaf87e239e71a3971ba85
https://jenkins.ubuntu.com/server/job/cloud-init-ci/34/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/34/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt
2index 38ad052..dd91477 100644
3--- a/doc/examples/cloud-config-disk-setup.txt
4+++ b/doc/examples/cloud-config-disk-setup.txt
5@@ -98,11 +98,11 @@ disk_setup:
6 #
7 # table_type=<TYPE>: Currently the following are supported:
8 # 'mbr': default and setups a MS-DOS partition table
9+# 'gpt': setups a GPT partition table
10 #
11-# Note: At this time only 'mbr' partition tables are allowed.
12-# It is anticipated in the future that we'll have GPT as
13-# option in the future, or even "RAID" to create a mdadm
14-# RAID.
15+# Note: At this time only 'mbr' and 'gpt' partition tables
16+# are allowed. It is anticipated in the future that
17+# we'll also have "RAID" to create a mdadm RAID.
18 #
19 # layout={...}: The device layout. This is a list of values, with the
20 # percentage of disk that partition will take.

Subscribers

People subscribed via source and target branches