From 9b43789fcd2234b3bc903b22b3835c7464ed3fa0 Mon Sep 17 00:00:00 2001 From: Nicholas Chase Date: Sun, 30 Jun 2013 10:33:09 -0400 Subject: [PATCH] Refactored active/passive section of HA guide As part of the restructuring of the HA guide to include active/active, the original active/passive page files are now renamed to be prefaced with "ap-" to distinguish them from the active/active pages, prefaced with "aa-". The main ha-guide.txt file has also been edited to reflect this change. bug 1196096 blueprint improve-high-availability-support Change-Id: I303f502a641278d1cdc9663381afd4c2be7cc67c --- .../openstack-ha/{api-node.txt => ap-api-node.txt} | 12 ++++++------ .../{api-pacemaker.txt => ap-api-pacemaker.txt} | 0 .../openstack-ha/{api-vip.txt => ap-api-vip.txt} | 0 .../{cinder-api.txt => ap-cinder-api.txt} | 0 ...{cloud-controller.txt => ap-cloud-controller.txt} | 4 ++-- .../{glance-api.txt => ap-glance-api.txt} | 0 .../openstack-ha/{keystone.txt => ap-keystone.txt} | 0 .../docbkx/openstack-ha/{mysql.txt => ap-mysql.txt} | 0 .../openstack-ha/{pacemaker.txt => ap-pacemaker.txt} | 0 .../{quantum-server.txt => ap-quantum-server.txt} | 0 .../openstack-ha/{rabbitmq.txt => ap-rabbitmq.txt} | 0 doc/src/docbkx/openstack-ha/ha-guide.txt | 6 +++--- 12 files changed, 11 insertions(+), 11 deletions(-) rename doc/src/docbkx/openstack-ha/{api-node.txt => ap-api-node.txt} (51%) rename doc/src/docbkx/openstack-ha/{api-pacemaker.txt => ap-api-pacemaker.txt} (100%) rename doc/src/docbkx/openstack-ha/{api-vip.txt => ap-api-vip.txt} (100%) rename doc/src/docbkx/openstack-ha/{cinder-api.txt => ap-cinder-api.txt} (100%) rename doc/src/docbkx/openstack-ha/{cloud-controller.txt => ap-cloud-controller.txt} (74%) rename doc/src/docbkx/openstack-ha/{glance-api.txt => ap-glance-api.txt} (100%) rename doc/src/docbkx/openstack-ha/{keystone.txt => ap-keystone.txt} (100%) rename doc/src/docbkx/openstack-ha/{mysql.txt => ap-mysql.txt} (100%) rename doc/src/docbkx/openstack-ha/{pacemaker.txt => ap-pacemaker.txt} (100%) rename doc/src/docbkx/openstack-ha/{quantum-server.txt => ap-quantum-server.txt} (100%) rename doc/src/docbkx/openstack-ha/{rabbitmq.txt => ap-rabbitmq.txt} (100%) diff --git a/doc/src/docbkx/openstack-ha/api-node.txt b/doc/src/docbkx/openstack-ha/ap-api-node.txt similarity index 51% rename from doc/src/docbkx/openstack-ha/api-node.txt rename to doc/src/docbkx/openstack-ha/ap-api-node.txt index 22d294647cc..4f8ad1ddea4 100644 --- a/doc/src/docbkx/openstack-ha/api-node.txt +++ b/doc/src/docbkx/openstack-ha/ap-api-node.txt @@ -4,9 +4,9 @@ The API node exposes OpenStack API endpoints onto external network (Internet). It needs to talk to the Cloud Controller on the management network. -include::api-vip.txt[] -include::keystone.txt[] -include::glance-api.txt[] -include::cinder-api.txt[] -include::quantum-server.txt[] -include::api-pacemaker.txt[] +include::ap-api-vip.txt[] +include::ap-keystone.txt[] +include::ap-glance-api.txt[] +include::ap-cinder-api.txt[] +include::ap-quantum-server.txt[] +include::ap-api-pacemaker.txt[] diff --git a/doc/src/docbkx/openstack-ha/api-pacemaker.txt b/doc/src/docbkx/openstack-ha/ap-api-pacemaker.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/api-pacemaker.txt rename to doc/src/docbkx/openstack-ha/ap-api-pacemaker.txt diff --git a/doc/src/docbkx/openstack-ha/api-vip.txt b/doc/src/docbkx/openstack-ha/ap-api-vip.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/api-vip.txt rename to doc/src/docbkx/openstack-ha/ap-api-vip.txt diff --git a/doc/src/docbkx/openstack-ha/cinder-api.txt b/doc/src/docbkx/openstack-ha/ap-cinder-api.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/cinder-api.txt rename to doc/src/docbkx/openstack-ha/ap-cinder-api.txt diff --git a/doc/src/docbkx/openstack-ha/cloud-controller.txt b/doc/src/docbkx/openstack-ha/ap-cloud-controller.txt similarity index 74% rename from doc/src/docbkx/openstack-ha/cloud-controller.txt rename to doc/src/docbkx/openstack-ha/ap-cloud-controller.txt index 7ae8eaeb4ef..111a7e4281f 100644 --- a/doc/src/docbkx/openstack-ha/cloud-controller.txt +++ b/doc/src/docbkx/openstack-ha/ap-cloud-controller.txt @@ -3,5 +3,5 @@ The Cloud Controller sits on the management network and needs to talk to all other services. -include::mysql.txt[] -include::rabbitmq.txt[] +include::ap-mysql.txt[] +include::ap-rabbitmq.txt[] diff --git a/doc/src/docbkx/openstack-ha/glance-api.txt b/doc/src/docbkx/openstack-ha/ap-glance-api.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/glance-api.txt rename to doc/src/docbkx/openstack-ha/ap-glance-api.txt diff --git a/doc/src/docbkx/openstack-ha/keystone.txt b/doc/src/docbkx/openstack-ha/ap-keystone.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/keystone.txt rename to doc/src/docbkx/openstack-ha/ap-keystone.txt diff --git a/doc/src/docbkx/openstack-ha/mysql.txt b/doc/src/docbkx/openstack-ha/ap-mysql.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/mysql.txt rename to doc/src/docbkx/openstack-ha/ap-mysql.txt diff --git a/doc/src/docbkx/openstack-ha/pacemaker.txt b/doc/src/docbkx/openstack-ha/ap-pacemaker.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/pacemaker.txt rename to doc/src/docbkx/openstack-ha/ap-pacemaker.txt diff --git a/doc/src/docbkx/openstack-ha/quantum-server.txt b/doc/src/docbkx/openstack-ha/ap-quantum-server.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/quantum-server.txt rename to doc/src/docbkx/openstack-ha/ap-quantum-server.txt diff --git a/doc/src/docbkx/openstack-ha/rabbitmq.txt b/doc/src/docbkx/openstack-ha/ap-rabbitmq.txt similarity index 100% rename from doc/src/docbkx/openstack-ha/rabbitmq.txt rename to doc/src/docbkx/openstack-ha/ap-rabbitmq.txt diff --git a/doc/src/docbkx/openstack-ha/ha-guide.txt b/doc/src/docbkx/openstack-ha/ha-guide.txt index 1e827d13afc..b1098f43e51 100644 --- a/doc/src/docbkx/openstack-ha/ha-guide.txt +++ b/doc/src/docbkx/openstack-ha/ha-guide.txt @@ -5,9 +5,9 @@ include::intro.txt[] include::ap-overview.txt[] -include::pacemaker.txt[] -include::cloud-controller.txt[] -include::api-node.txt[] +include::ap-pacemaker.txt[] +include::ap-cloud-controller.txt[] +include::ap-api-node.txt[] include::aa-overview.txt[] include::aa-database.txt[]