From 47f22c58203b34d17d818552ae5646f78ead4c5e Mon Sep 17 00:00:00 2001 From: Sahid Orentino Ferdjaoui Date: Sun, 12 Jan 2014 16:20:47 +0100 Subject: [PATCH] Fix configurations reference for SPICE The following options appear: enabled = False (BoolOpt) enable spice related features enabled = False (BoolOpt) Whether the V3 API is enabled or not The option about V3 API is for nova v3 api, a mistake was also fixed on nova.flagmappings. Change-Id: I110f860dd220da4dcdf573b42f67abaee1945c22 Closes-bug: #1266977 --- doc/common/tables/nova-spice.xml | 6 +----- tools/autogenerate-config-flagmappings/nova.flagmappings | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/common/tables/nova-spice.xml b/doc/common/tables/nova-spice.xml index e5d4be8e8a..54e7a1bd9d 100644 --- a/doc/common/tables/nova-spice.xml +++ b/doc/common/tables/nova-spice.xml @@ -23,10 +23,6 @@ enabled = False (BoolOpt) enable spice related features - - enabled = False - (BoolOpt) Whether the V3 API is enabled or not - html5proxy_base_url = http://127.0.0.1:6082/spice_auto.html (StrOpt) location of spice html5 console proxy, in the form "http://127.0.0.1:6082/spice_auto.html" @@ -45,4 +41,4 @@ - \ No newline at end of file + diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index e6c3bc5ede..22e6749c46 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -158,7 +158,7 @@ enable_instance_password compute enable_network_quota quota enable_new_services api enabled spice -enabled v3api +enabled apiv3 enabled_apis api enabled_ssl_apis api extensions_blacklist apiv3