From 14fc5372709bc15beb1454b189227f39b8123bb1 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Fri, 18 Apr 2014 11:00:43 +0800 Subject: [PATCH] Replace Havana references with Icehouse Fix URLs to point to Icehouse, now docs.openstack.org/icehouse is available. Change-Id: Id614a8c7b43d707436369675d946d2a70896dd23 --- .../section_compute-configure-service-groups.xml | 2 +- .../networking/section_networking_introduction.xml | 14 +++++++------- .../section_object-storage-admin.xml | 2 +- .../section_ts_no_emulator_x86_64.xml | 2 +- doc/admin-guide-cloud/section_volume-migration.xml | 2 +- doc/common/section_cli_nova_evacuate.xml | 2 +- doc/install-guide/ch_overview.xml | 4 ---- doc/training-guides/lab001-control-node.xml | 2 +- doc/training-guides/lab002-network-node.xml | 2 +- doc/training-guides/lab003-compute-node.xml | 2 +- 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml index c3ae17875e..8d3c0bce5b 100644 --- a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml +++ b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml @@ -83,7 +83,7 @@ address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181" memcached is often used for both OpenStack Object Storage and OpenStack dashboard, it might already be installed. If memcached is not installed, refer to the OpenStack Installation Guide for more information. The following values in the /etc/nova/nova.conf file (on every diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml index 525501d12c..dcf6dd8ec8 100644 --- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml +++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml @@ -606,7 +606,7 @@ enabled = True
Plug-in configurations For configurations options, see Networking configuration options in Configuration Reference. These sections explain how to configure specific @@ -630,7 +630,7 @@ enabled = True pairs: server = <controller-ip>:<port> For database configuration, see Install Networking Services in the Installation Guide in the password address = switch mgmt ip address ostype = NOS For database configuration, see Install Networking Services in any of the Installation Guides in the /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini to specify these values (for database configuration, see Install Networking Services in Installation Guide): @@ -782,7 +782,7 @@ allow_overlapping_ips = True /etc/neutron/plugins/vmware/nsx.ini file, and add the following entries (for database configuration, see Install Networking Services in Installation Guide): @@ -998,7 +998,7 @@ director_server_port = "PLUMgrid-director-port" username = "PLUMgrid-director-admin-username" password = "PLUMgrid-director-admin-password" For database configuration, see Install Networking Services in the Installation Guide. @@ -1070,7 +1070,7 @@ password = "PLUMgrid-director-admin-password" For database configuration, see Install Networking Services in Installation Guide. diff --git a/doc/admin-guide-cloud/section_object-storage-admin.xml b/doc/admin-guide-cloud/section_object-storage-admin.xml index e97771a472..15b6077570 100644 --- a/doc/admin-guide-cloud/section_object-storage-admin.xml +++ b/doc/admin-guide-cloud/section_object-storage-admin.xml @@ -11,7 +11,7 @@ xlink:href="http://docs.openstack.org/developer/swift/" >docs.openstack.org/developer/swift/. See the OpenStack Configuration Reference for a list of configuration options for Object Storage. diff --git a/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml b/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml index 814bebec3f..736e4ae7d3 100644 --- a/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml +++ b/doc/admin-guide-cloud/section_ts_no_emulator_x86_64.xml @@ -12,7 +12,7 @@ On the KVM host run, cat /proc/cpuinfo. Make sure the vme and svm flags are set. Follow the instructions in the - + enabling KVM section of the Configuration Reference to enable hardware virtualization support in your BIOS. diff --git a/doc/admin-guide-cloud/section_volume-migration.xml b/doc/admin-guide-cloud/section_volume-migration.xml index 5012976e58..5e559eabe4 100644 --- a/doc/admin-guide-cloud/section_volume-migration.xml +++ b/doc/admin-guide-cloud/section_volume-migration.xml @@ -28,7 +28,7 @@ While most back-ends support this function, not all do. See the driver documentation in the OpenStack Configuration Reference for more details. diff --git a/doc/common/section_cli_nova_evacuate.xml b/doc/common/section_cli_nova_evacuate.xml index 6da91f4e73..c52caa94bc 100644 --- a/doc/common/section_cli_nova_evacuate.xml +++ b/doc/common/section_cli_nova_evacuate.xml @@ -33,7 +33,7 @@ To preserve the user disk data on the evacuated server, deploy OpenStack Compute with a shared file system. To configure your system, see Configure migrations in OpenStack Configuration Reference. In the following example, the password remains unchanged: diff --git a/doc/install-guide/ch_overview.xml b/doc/install-guide/ch_overview.xml index fb03b6d168..617cab8a28 100644 --- a/doc/install-guide/ch_overview.xml +++ b/doc/install-guide/ch_overview.xml @@ -4,10 +4,6 @@ xml:id="ch_overview"> Architecture - - We are updating this material for Icehouse. You may find structure - and/or content issues during this process. -
Overview The OpenStack project is an open source cloud diff --git a/doc/training-guides/lab001-control-node.xml b/doc/training-guides/lab001-control-node.xml index 8e73ce5d4e..4abb8d6795 100644 --- a/doc/training-guides/lab001-control-node.xml +++ b/doc/training-guides/lab001-control-node.xml @@ -38,7 +38,7 @@ Add Havana repositories: # apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring -# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list +# echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list Update your system: diff --git a/doc/training-guides/lab002-network-node.xml b/doc/training-guides/lab002-network-node.xml index 57c1ef1357..dbe32aa92b 100644 --- a/doc/training-guides/lab002-network-node.xml +++ b/doc/training-guides/lab002-network-node.xml @@ -37,7 +37,7 @@ Add Havana repositories: # apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring - # echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list + # echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list diff --git a/doc/training-guides/lab003-compute-node.xml b/doc/training-guides/lab003-compute-node.xml index 7ab07eb3ff..cd403b9220 100644 --- a/doc/training-guides/lab003-compute-node.xml +++ b/doc/training-guides/lab003-compute-node.xml @@ -43,7 +43,7 @@ Add Havana repositories: # apt-get install ubuntu-cloud-keyring python-software-properties software-properties-common python-keyring - # echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/havana main >> /etc/apt/sources.list.d/havana.list + # echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/icehouse main >> /etc/apt/sources.list.d/icehouse.list