From 1420f51f631252f8357e3e4137013c03e58dbc14 Mon Sep 17 00:00:00 2001
From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
Date: Mon, 30 Dec 2013 15:20:31 +0000
Subject: [PATCH] Renames instance_type to flavor in baremetal virt driver

  According an already merged blueprint flavor-instance-type-dedup
  + Reorder ovs_vsctl_timeout in
    tools/autogenerate-config-flagmappings/nova.flagmappings

Change-Id: Ife6fd326b1581a57b0810f12a8c0c6aa8160e8ea
Closes-Bug: #1260092
---
 doc/common/tables/nova-baremetal.xml                     | 4 ++--
 tools/autogenerate-config-flagmappings/nova.flagmappings | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/common/tables/nova-baremetal.xml b/doc/common/tables/nova-baremetal.xml
index 90f58b41b5..0a3db18595 100644
--- a/doc/common/tables/nova-baremetal.xml
+++ b/doc/common/tables/nova-baremetal.xml
@@ -36,8 +36,8 @@
                        <td>(StrOpt) Cells communication driver to use</td>
               </tr>
               <tr>
-                       <td>instance_type_extra_specs=</td>
-                       <td>(ListOpt) a list of additional capabilities corresponding to instance_type_extra_specs for this compute host to advertise. Valid entries are name=value, pairs For example, "key1:val1, key2:val2"</td>
+                       <td>flavor_extra_specs=</td>
+                       <td>(ListOpt) a list of additional capabilities corresponding to flavor_extra_specs for this compute host to advertise. Valid entries are name=value, pairs For example, "key1:val1, key2:val2"</td>
               </tr>
               <tr>
                        <td>ipmi_power_retry=5</td>
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index fd82584d13..eeee737e3b 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -163,9 +163,9 @@ fixed_key keymgr
 fixed_range_v6 ipv6
 flat_injected network
 flat_interface network
-ovs_vsctl_timeout network
 flat_network_bridge network
 flat_network_dns network
+flavor_extra_specs baremetal
 floating_ip_dns_manager network
 force_config_drive configdrive
 force_dhcp_release network
@@ -205,7 +205,6 @@ instance_dns_domain network
 instance_dns_manager network
 instance_format logging
 instance_name_template api
-instance_type_extra_specs baremetal
 instance_update_num_instances cells
 instance_updated_at_threshold cells
 instance_usage_audit compute
@@ -367,6 +366,7 @@ osapi_glance_link_prefix glance
 osapi_hide_server_address_states api
 osapi_max_limit policy
 osapi_max_request_body_size policy
+ovs_vsctl_timeout network
 password redis
 password_length policy
 pci_alias pci