openstack/openstack-manuals
Code Issues Proposed changes

Renames instance_type to flavor in baremetal virt driver

Browse Source 
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
This commit is contained in:
Sahid Orentino Ferdjaoui 2013-12-30 15:20:31 +00:00
parent 863f52039a
commit 1420f51f63
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/common/tables/nova-baremetal.xml
View File

@ -36,8 +36,8 @@
<td>(StrOpt) Cells communication driver to use</td> <td>(StrOpt) Cells communication driver to use</td>
</tr> </tr>
<tr> <tr>
<td>instance_type_extra_specs=</td> <td>flavor_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>(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>
<tr> <tr>
<td>ipmi_power_retry=5</td> <td>ipmi_power_retry=5</td>

4
tools/autogenerate-config-flagmappings/nova.flagmappings
View File

@ -163,9 +163,9 @@ fixed_key keymgr
fixed_range_v6 ipv6 fixed_range_v6 ipv6
flat_injected network flat_injected network
flat_interface network flat_interface network
ovs_vsctl_timeout network
flat_network_bridge network flat_network_bridge network
flat_network_dns network flat_network_dns network
flavor_extra_specs baremetal
floating_ip_dns_manager network floating_ip_dns_manager network
force_config_drive configdrive force_config_drive configdrive
force_dhcp_release network force_dhcp_release network
@ -205,7 +205,6 @@ instance_dns_domain network
instance_dns_manager network instance_dns_manager network
instance_format logging instance_format logging
instance_name_template api instance_name_template api
instance_type_extra_specs baremetal
instance_update_num_instances cells instance_update_num_instances cells
instance_updated_at_threshold cells instance_updated_at_threshold cells
instance_usage_audit compute instance_usage_audit compute
@ -367,6 +366,7 @@ osapi_glance_link_prefix glance
osapi_hide_server_address_states api osapi_hide_server_address_states api
osapi_max_limit policy osapi_max_limit policy
osapi_max_request_body_size policy osapi_max_request_body_size policy
ovs_vsctl_timeout network
password redis password redis
password_length policy password_length policy
pci_alias pci pci_alias pci