From f8a5a4022441617aaa508e8e59f542d047ba5ba2 Mon Sep 17 00:00:00 2001
From: chenxing <chason.chan@foxmail.com>
Date: Sat, 21 Oct 2017 12:19:41 +0800
Subject: [PATCH] Update the valid disk bus list for qemu and kvm hypervisors

The Nova project has added 'sata' as a valid disk bus for qemu and
kvm hypervisors, see https://review.openstack.org/#/c/459794/6

DocImpact: add to metadefs release note

Related-Bug: #1686136
Change-Id: If8e23756616e46391827ac3d85d287940862613f
---
 .../v2/samples/metadef-properties-list-response.json      | 4 +++-
 doc/source/admin/manage-images.rst                        | 8 +++++++-
 etc/metadefs/compute-libvirt-image.json                   | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/api-ref/source/v2/samples/metadef-properties-list-response.json b/api-ref/source/v2/samples/metadef-properties-list-response.json
index aeb4a5da95..8284681c29 100644
--- a/api-ref/source/v2/samples/metadef-properties-list-response.json
+++ b/api-ref/source/v2/samples/metadef-properties-list-response.json
@@ -8,7 +8,9 @@
                 "uml",
                 "xen",
                 "ide",
-                "usb"
+                "usb",
+                "fdc",
+                "sata"
             ],
             "title": "Disk Bus",
             "type": "string"
diff --git a/doc/source/admin/manage-images.rst b/doc/source/admin/manage-images.rst
index 6e44a9ffc4..c66731136c 100644
--- a/doc/source/admin/manage-images.rst
+++ b/doc/source/admin/manage-images.rst
@@ -176,11 +176,17 @@ in the following tables.
 +-------------------------+--------------------------+
 | libvirt\_type setting   | Supported model values   |
 +=========================+==========================+
-| qemu or kvm             | *  ide                   |
+| qemu or kvm             | *  fdc                   |
+|                         |                          |
+|                         | *  ide                   |
 |                         |                          |
 |                         | *  scsi                  |
 |                         |                          |
+|                         | *  sata                  |
+|                         |                          |
 |                         | *  virtio                |
+|                         |                          |
+|                         | *  usb                   |
 +-------------------------+--------------------------+
 | xen                     | *  ide                   |
 |                         |                          |
diff --git a/etc/metadefs/compute-libvirt-image.json b/etc/metadefs/compute-libvirt-image.json
index d418656a5c..5ef0b8c130 100644
--- a/etc/metadefs/compute-libvirt-image.json
+++ b/etc/metadefs/compute-libvirt-image.json
@@ -20,7 +20,9 @@
                 "uml",
                 "xen",
                 "ide",
-                "usb"
+                "usb",
+                "fdc",
+                "sata"
             ]
         },
         "hw_rng_model": {