From c07563f042ea8ede47ee2f3512accde7db070227 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 23 Aug 2015 10:04:44 +0200 Subject: [PATCH] Fix URLs to admin-guide-cloud The Cloud Administrators Guide has been moved from XML to RST and all URLs have changed. Adjust glance and change http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html to new location http://docs.openstack.org/admin-guide-cloud/compute-flavors.html. Change-Id: Ibb9a5f9394480976f37aa0338413f04abae735d9 Implements: blueprint reorganise-user-guides --- etc/metadefs/compute-quota.json | 4 ++-- etc/metadefs/compute-vmware-flavor.json | 2 +- etc/metadefs/compute-vmware-quota-flavor.json | 2 +- etc/metadefs/compute-watchdog.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/metadefs/compute-quota.json b/etc/metadefs/compute-quota.json index ca1bd596c7..2295d4c180 100644 --- a/etc/metadefs/compute-quota.json +++ b/etc/metadefs/compute-quota.json @@ -1,7 +1,7 @@ { "namespace": "OS::Compute::Quota", "display_name": "Flavor Quota", - "description": "Compute drivers may enable quotas on CPUs available to a VM, disk tuning, bandwidth I/O, and instance VIF traffic control. See: http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html", + "description": "Compute drivers may enable quotas on CPUs available to a VM, disk tuning, bandwidth I/O, and instance VIF traffic control. See: http://docs.openstack.org/admin-guide-cloud/compute-flavors.html", "visibility": "public", "protected": true, "resource_type_associations": [ @@ -106,4 +106,4 @@ } } ] -} \ No newline at end of file +} diff --git a/etc/metadefs/compute-vmware-flavor.json b/etc/metadefs/compute-vmware-flavor.json index 5d77b7a3f5..450d48d851 100644 --- a/etc/metadefs/compute-vmware-flavor.json +++ b/etc/metadefs/compute-vmware-flavor.json @@ -1,7 +1,7 @@ { "namespace": "OS::Compute::VMwareFlavor", "display_name": "VMware Driver Options for Flavors", - "description": "VMware Driver Options for Flavors may be used to customize and manage Nova Flavors. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. See: http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html", + "description": "VMware Driver Options for Flavors may be used to customize and manage Nova Flavors. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. See: http://docs.openstack.org/admin-guide-cloud/compute-flavors.html", "visibility": "public", "protected": true, "resource_type_associations": [ diff --git a/etc/metadefs/compute-vmware-quota-flavor.json b/etc/metadefs/compute-vmware-quota-flavor.json index ea711ac2a9..4125f31c66 100644 --- a/etc/metadefs/compute-vmware-quota-flavor.json +++ b/etc/metadefs/compute-vmware-quota-flavor.json @@ -1,7 +1,7 @@ { "namespace": "OS::Compute::VMwareQuotaFlavor", "display_name": "VMware Quota for Flavors", - "description": "The VMware compute driver allows various compute quotas to be specified on flavors. When specified, the VMWare driver will ensure that the quota is enforced. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. For a list of hypervisors, see: https://wiki.openstack.org/wiki/HypervisorSupportMatrix. For flavor customization, see: http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html", + "description": "The VMware compute driver allows various compute quotas to be specified on flavors. When specified, the VMWare driver will ensure that the quota is enforced. These are properties specific to VMWare compute drivers and will only have an effect if the VMWare compute driver is enabled in Nova. For a list of hypervisors, see: https://wiki.openstack.org/wiki/HypervisorSupportMatrix. For flavor customization, see: http://docs.openstack.org/admin-guide-cloud/compute-flavors.html", "visibility": "public", "protected": true, "resource_type_associations": [ diff --git a/etc/metadefs/compute-watchdog.json b/etc/metadefs/compute-watchdog.json index 7eb32cecc3..e76507da05 100644 --- a/etc/metadefs/compute-watchdog.json +++ b/etc/metadefs/compute-watchdog.json @@ -1,7 +1,7 @@ { "namespace": "OS::Compute::Watchdog", "display_name": "Watchdog Behavior", - "description": "Compute drivers may enable watchdog behavior over instances. See: http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html", + "description": "Compute drivers may enable watchdog behavior over instances. See: http://docs.openstack.org/admin-guide-cloud/compute-flavors.html", "visibility": "public", "protected": true, "resource_type_associations": [