From 11bcc16d1fc5f598cbabfbbcfcc2c6a2d6c51295 Mon Sep 17 00:00:00 2001 From: Tanja Roth Date: Wed, 8 Nov 2023 04:30:30 +0100 Subject: [PATCH] generic: get rid of outdated &hasi; entity (#356) * generic: get rid of outdated &hasi; entity - the following preparations where needed before we can fix the value of &productname; via doc-kit: * replace '[T,t]he &hasi;' with &productname; where appropriate * replace '[T,t]he &hasi;' with '&ha; (software)' where appropriate * update product-entities.ent * Apply suggestions from code review * Further changes required for version 12 Co-authored-by: Tahlia Richardson <3069029+tahliar@users.noreply.github.com> --------- Co-authored-by: Tahlia Richardson <3069029+tahliar@users.noreply.github.com> --- xml/art_sle_ha_geo_quick.xml | 2 +- xml/art_sle_ha_install_quick.xml | 13 +++--- xml/geo_install_i.xml | 4 +- xml/ha_concepts.xml | 75 ++++++++++++++++---------------- xml/ha_config_basics.xml | 41 +++++++++-------- xml/ha_config_cli.xml | 56 ++++++++++++------------ xml/ha_docupdates.xml | 2 +- xml/ha_drbd.xml | 8 ++-- xml/ha_example_gui_i.xml | 2 +- xml/ha_fencing.xml | 4 +- xml/ha_glossary.xml | 9 ++-- xml/ha_hawk2_cons_i.xml | 8 ++-- xml/ha_hawk2_maintenance_i.xml | 6 +-- xml/ha_hawk2_manage_i.xml | 12 ++--- xml/ha_hawk2_rsc_i.xml | 8 ++-- xml/ha_hawk_rsc_config_i.xml | 22 +++++----- xml/ha_hawk_rsc_manage_i.xml | 10 ++--- xml/ha_install.xml | 10 ++--- xml/ha_installation.xml | 2 +- xml/ha_lb_lvs.xml | 2 +- xml/ha_loadbalancing.xml | 4 +- xml/ha_maintenance.xml | 8 ++-- xml/ha_management.xml | 4 +- xml/ha_migration.xml | 8 ++-- xml/ha_ocfs2.xml | 2 +- xml/ha_storage_protection.xml | 2 +- xml/ha_troubleshooting.xml | 5 +-- xml/phrases-decl.ent | 4 +- xml/product-entities.ent | 6 +-- 29 files changed, 167 insertions(+), 172 deletions(-) diff --git a/xml/art_sle_ha_geo_quick.xml b/xml/art_sle_ha_geo_quick.xml index a8c4b49f9..97cbce87b 100644 --- a/xml/art_sle_ha_geo_quick.xml +++ b/xml/art_sle_ha_geo_quick.xml @@ -337,7 +337,7 @@ information in the &haguide; for &productname; &productnumber;, available from . Refer to the - chapter Installing the &hasi;, section + chapter Installing &productname;, section Mass Installation and Deployment with &ay;. diff --git a/xml/art_sle_ha_install_quick.xml b/xml/art_sle_ha_install_quick.xml index ee5a879b8..b2e06f141 100644 --- a/xml/art_sle_ha_install_quick.xml +++ b/xml/art_sle_ha_install_quick.xml @@ -292,8 +292,8 @@ Installing &sls; and &ha; Extension - The packages for configuring and managing a cluster with the - &hasi; are included in the &ha; installation + The packages for configuring and managing a cluster with &productname; + are included in the &ha; installation pattern. This pattern is only available after &productname; has been installed as an extension to &slsreg;. @@ -337,10 +337,9 @@ Installing Software Packages on All Parties - For an automated installation of &sls; &productnumber; and &productname; - &productnumber;, use &ay; to clone existing nodes. For more information, - see . + For an automated installation of &sls; &productnumber; and &productname; &productnumber;, + use &ay; to clone existing nodes. For more + information, see . @@ -432,7 +431,7 @@ In &sls;, watchdog support in the kernel is enabled by default: It ships with several kernel modules that provide hardware-specific - watchdog drivers. The &hasi; uses the SBD daemon as the software component + watchdog drivers. &productname; uses the SBD daemon as the software component that feeds the watchdog. diff --git a/xml/geo_install_i.xml b/xml/geo_install_i.xml index 9634fa13d..dcf2d44fe 100644 --- a/xml/geo_install_i.xml +++ b/xml/geo_install_i.xml @@ -22,7 +22,7 @@ - For using the &hasi; and &hageo;, you need the packages included in the + For using &productname; and &hageo;, you need the packages included in the following installation patterns: @@ -119,7 +119,7 @@ information in the &haguide; for &productname; &productnumber;, available from . Refer to the - chapter Installation the &hasi;, section + chapter Installing &productname;, section Mass Installation and Deployment with &ay;. diff --git a/xml/ha_concepts.xml b/xml/ha_concepts.xml index d30ba0c0d..f3512df91 100644 --- a/xml/ha_concepts.xml +++ b/xml/ha_concepts.xml @@ -23,9 +23,9 @@ management functionality (supporting failover, failback, and migration (load balancing) of individually managed cluster resources). - - This chapter introduces the main product features and benefits of the - &hasi;. Inside you will find several example clusters and learn about + + This chapter introduces the main product features and benefits of &productname;. + Inside you will find several example clusters and learn about the components making up a cluster. The last section provides an overview of the architecture, describing the individual architecture layers and processes within the cluster. @@ -47,12 +47,12 @@ - Availability as Extension + Availability as a Module or Extension - The &hasi; is available as an extension to &sls; &productnumber;. - Support for &geo.dispersed; clusters (&geo; clusters) is available - as a separate extension to the &hasi;, called &hageo;. + &ha; is available for several products. Support for &geo.dispersed; clusters + (&geo; clusters) is available as a separate extension called &hageo;. For details, see + . @@ -67,7 +67,7 @@ Wide Range of Clustering Scenarios - The &hasi; supports the following scenarios: + &productname; supports the following scenarios: @@ -126,11 +126,11 @@ Flexibility - The &hasi; ships with &corosync; messaging and membership layer + &productname; ships with &corosync; messaging and membership layer and Pacemaker Cluster Resource Manager. Using Pacemaker, administrators can continually monitor the health and status of their resources, manage dependencies, and automatically stop and start services based on highly - configurable rules and policies. The &hasi; allows you to tailor a + configurable rules and policies. &productname; allows you to tailor a cluster to the specific applications and hardware infrastructure that fit your organization. Time-dependent configuration enables services to automatically migrate back to repaired nodes at specified times. @@ -140,16 +140,15 @@ Storage and Data Replication - With the &hasi; you can dynamically assign and reassign server - storage as needed. It supports Fibre Channel storage area networks (SAN) - and iSCSI storage on networks. Thus, shared disk systems are supported, - but they are not a requirement. - &productname; also comes with a cluster-aware file - system and volume manager (OCFS2) and the clustered Logical Volume - Manager (cLVM). For replication of your data, you can use DRBD* to - mirror the data of a &ha; service from the active node of a cluster - to its standby node. Furthermore, &productname; also supports CTDB - (Clustered Trivial Database), a technology for Samba clustering. + With &productname; you can dynamically assign and reassign server + storage as needed. It supports Fibre Channel or iSCSI storage area + networks (SANs). Shared disk systems are also supported, but they are + not a requirement. &productname; also comes with a cluster-aware file + system (OCFS2) and the cluster Logical Volume Manager (&clvm;). + For replication of your data, use DRBD* to mirror the data of + a &ha; service from the active node of a cluster to its standby node. + Furthermore, &productname; also supports CTDB (Cluster Trivial Database), + a technology for Samba clustering. @@ -169,7 +168,7 @@ &productname; has been extended to support different geographical scenarios. Support for &geo.dispersed; clusters (&geo; clusters) - is available as a separate extension to &hasi;, called &hageo;. + is available as a separate extension called &hageo;. @@ -242,8 +241,8 @@ User-friendly Administration Tools - The &hasi; ships with a set of powerful tools for basic installation - and setup of your cluster, effective configuration and + &productname; ships with a set of powerful tools. Use them for basic installation + and setup of your cluster and for effective configuration and administration: @@ -252,7 +251,7 @@ A graphical user interface for general system installation and - administration. Use it to install the &hasi; on top of &sls; as + administration. Use it to install &productname; on top of &sls; as described in the &haquick;. &yast; also provides the following modules in the &ha; category to help configure your cluster or individual components: @@ -310,18 +309,18 @@ Benefits - The &hasi; allows you to configure up to 32 Linux servers into a - high-availability cluster (HA cluster), where resources can be - dynamically switched or moved to any server in the cluster. Resources can - be configured to automatically migrate if a server fails, or they can be + &productname; allows you to configure up to 32 Linux servers into a + high-availability cluster (HA cluster). Resources can be + dynamically switched or moved to any node in the cluster. Resources can + be configured to automatically migrate if a node fails, or they can be moved manually to troubleshoot hardware or balance the workload. - The &hasi; provides high availability from commodity components. Lower + &productname; provides high availability from commodity components. Lower costs are obtained through the consolidation of applications and - operations onto a cluster. The &hasi; also allows you to centrally - manage the complete cluster and to adjust resources to meet changing + operations onto a cluster. &productname; also allows you to centrally + manage the complete cluster. You can adjust resources to meet changing workload requirements (thus, manually load balance the cluster). Allowing clusters of more than two nodes also provides savings by allowing several nodes to share a hot spare. @@ -386,7 +385,7 @@ - The following scenario illustrates some benefits the &hasi; can + The following scenario illustrates some benefits &productname; can provide. @@ -453,7 +452,7 @@ - When Web Server 1 failed, the &hasi; software did the following: + When Web Server 1 failed, the &ha; software did the following: @@ -496,13 +495,13 @@ either automatically fail back (move back) to Web Server 1, or they can stay where they are. This depends on how you configured the resources for them. Migrating the services back to Web Server 1 will incur some - down-time, so the &hasi; also allows you to defer the migration until + down-time. Therefore &productname; also allows you to defer the migration until a period when it will cause little or no service interruption. There are advantages and disadvantages to both alternatives. - The &hasi; also provides resource migration capabilities. You can move + &productname; also provides resource migration capabilities. You can move applications, Web sites, etc. to other servers in your cluster as required for system management. @@ -518,7 +517,7 @@ Cluster Configurations: Storage - Cluster configurations with the &hasi; might or might not include a + Cluster configurations with &productname; might or might not include a shared disk subsystem. The shared disk subsystem can be connected via high-speed Fibre Channel cards, cables, and switches, or it can be configured to use iSCSI. If a server fails, another designated server in @@ -588,7 +587,7 @@ Architecture - This section provides a brief overview of the &hasi; architecture. It + This section provides a brief overview of &productname; architecture. It identifies and provides information on the architectural components, and describes how those components interoperate. @@ -596,7 +595,7 @@ Architecture Layers - The &hasi; has a layered architecture. + &productname; has a layered architecture. illustrates the different layers and their associated components. diff --git a/xml/ha_config_basics.xml b/xml/ha_config_basics.xml index c8dfc14b6..a75b0c304 100644 --- a/xml/ha_config_basics.xml +++ b/xml/ha_config_basics.xml @@ -21,7 +21,7 @@ In this chapter, we will introduce some basic concepts you need to know when configuring resources and administering your cluster. The following chapters show you how to execute the main configuration and - administration tasks with each of the management tools the &hasi; + administration tasks with each of the management tools &productname; provides. @@ -506,14 +506,14 @@ C = number of cluster nodes If a resource has specific environment requirements, make sure they are present and identical on all cluster nodes. This kind of configuration - is not managed by the &hasi;. You must do this yourself. + is not managed by the &ha; software. You must do this yourself. Do Not Touch Services Managed by the Cluster - When managing a resource with the &hasi;, the same resource must not + When managing a resource with the &productname;, the same resource must not be started or stopped otherwise (outside of the cluster, for example - manually or on boot or reboot). The &hasi; software is responsible + manually or on boot or reboot). The &ha; software is responsible for all service start or stop actions. @@ -560,8 +560,8 @@ C = number of cluster nodes start, stop or monitor command. - Typically, resource agents come in the form of shell scripts. The - &hasi; supports the following classes of resource agents: + Typically, resource agents come in the form of shell scripts. &productname; + supports the following classes of resource agents: @@ -681,7 +681,7 @@ C = number of cluster nodes - The agents supplied with the &hasi; are written to OCF + The agents supplied with &productname; are written to OCF specifications. @@ -2240,7 +2240,7 @@ monitor_0 interval=5s timeout=20s the resources diminish in performance (or even fail). - To take this into account, the &hasi; allows you to specify the + To take this into account, &productname; allows you to specify the following parameters: @@ -2279,7 +2279,7 @@ monitor_0 interval=5s timeout=20s A node is considered eligible for a resource if it has sufficient free capacity to satisfy the resource's requirements. The nature of the - capacities is completely irrelevant for the &hasi;; it only makes + capacities is completely irrelevant for the &ha; software; it only makes sure that all capacity requirements of a resource are satisfied before moving a resource to a node. @@ -2292,7 +2292,7 @@ monitor_0 interval=5s timeout=20s If multiple resources with utilization attributes are grouped or have - colocation constraints, the &hasi; takes that into account. If + colocation constraints, &productname; takes that into account. If possible, the resources will be placed on a node that can fulfill all capacity requirements. @@ -2306,7 +2306,7 @@ monitor_0 interval=5s timeout=20s - The &hasi; also provides means to detect and configure both node + &productname; also provides means to detect and configure both node capacity and resource requirements automatically: @@ -2338,7 +2338,7 @@ monitor_0 interval=5s timeout=20s - Apart from detecting the minimal requirements, the &hasi; also allows + Apart from detecting the minimal requirements, &productname; also allows to monitor the current utilization via the VirtualDomain resource agent. It detects CPU and RAM use of the virtual machine. To use this feature, configure a @@ -2456,13 +2456,13 @@ property placement-strategy="minimal" By providing support for monitoring plug-ins (formerly named Nagios - plug-ins), the &hasi; now also allows you to monitor services on + plug-ins), &productname; now also allows you to monitor services on remote hosts. You can collect external statuses on the guests without modifying the guest image. For example, VM guests might run Web services or simple network resources that need to be accessible. With the Nagios resource agents, you can now monitor the Web service or the network - resource on the guest. In case these services are not reachable anymore, - the &hasi; will trigger a restart or migration of the respective + resource on the guest. If these services are not reachable anymore, + &productname; will trigger a restart or migration of the respective guest. @@ -2576,7 +2576,7 @@ group g-vm1-and-services vm1 vm1-sshd \ not need to run the cluster stack to become members of the cluster. - The &hasi; can now launch virtual environments (KVM and LXC), plus + &productname; can now launch virtual environments (KVM and LXC), plus the resources that live within those virtual environments without requiring the virtual environments to run &pace; or &corosync;. @@ -2588,8 +2588,7 @@ group g-vm1-and-services vm1 vm1-sshd \ - The normal (bare-metal) cluster nodes run the - &hasi;. + The normal (bare-metal) cluster nodes run &productname;. @@ -2643,7 +2642,7 @@ group g-vm1-and-services vm1 vm1-sshd \ To prevent a node from running out of disk space and thus being unable to - manage any resources that have been assigned to it, the &hasi; + manage any resources that have been assigned to it, &productname; provides a resource agent, ocf:pacemaker:SysInfo. Use it to monitor a node's health with regard to disk partitions. @@ -2795,8 +2794,8 @@ group g-vm1-and-services vm1 vm1-sshd \ - Home page of Pacemaker, the cluster resource manager shipped with the - &hasi;. + Home page of Pacemaker, the cluster resource manager shipped with + &productname;. diff --git a/xml/ha_config_cli.xml b/xml/ha_config_cli.xml index ac3708325..22d800262 100644 --- a/xml/ha_config_cli.xml +++ b/xml/ha_config_cli.xml @@ -6,7 +6,7 @@ ]> @@ -161,7 +161,7 @@ The &crmsh; supports full tab completion in Bash directly, not only for the interactive shell. For example, typing crm help - config will complete the word + config will complete the word like in the interactive shell. @@ -339,9 +339,9 @@ drbdconf (string, [/etc/drbd.conf]): Path to drbd.conf Operations' defaults (advisory minimum): start timeout=240 - promote timeout=90 - demote timeout=90 - notify timeout=90 + promote timeout=90 + demote timeout=90 + notify timeout=90 stop timeout=100 monitor_Slave_0 interval=20 timeout=20 start-delay=1m monitor_Master_0 interval=10 timeout=20 start-delay=1m @@ -797,7 +797,7 @@ INFO: myNewConfig shadow CIB created following example is a transcript, adding a monitor operation: &prompt.root;crm configure -&prompt.crm.conf;show fence-&node2; +&prompt.crm.conf;show fence-&node2; primitive fence-&node2; stonith:apcsmart \ params hostlist="&node2;" &prompt.crm.conf;monitor fence-&node2; 120m:60s @@ -864,8 +864,8 @@ Votequorum information Expected votes: 2 Highest expected: 2 Total votes: 2 -Quorum: 2 -Flags: Quorate +Quorum: 2 +Flags: Quorate Membership information ---------------------- @@ -1066,7 +1066,7 @@ property $id="cib-bootstrap-options" \ . - + --> @@ -1233,16 +1233,16 @@ hostname (string): Hostname &node1; to 100 would be the following: - &prompt.crm.conf;location loc-fs1 fs1 100: &node1; @@ -1311,9 +1311,9 @@ hostname (string): Hostname filesystem_resource and nfs_group always on the same host, use the following constraint: - &prompt.crm.conf;colocation nfs_on_filesystem inf: nfs_group filesystem_resource @@ -1359,10 +1359,10 @@ hostname (string): Hostname Use the following command in the crm shell to configure an ordering constraint: - &prompt.crm.conf;order nfs_after_filesystem mandatory: filesystem_resource nfs_group @@ -1457,12 +1457,12 @@ hostname (string): Hostname with degraded performance. - To take this into account, the &hasi; allows you to specify the + To take this into account, &productname; allows you to specify the following parameters: - dejan 2011-11-24: It is not clear whether location - constraints have any influence on resource placement in case - placement-strategy is set to something other than default. + dejan 2011-11-24: It is not clear whether location + constraints have any influence on resource placement in case + placement-strategy is set to something other than default. Or is it explained elsewhere? @@ -1720,7 +1720,7 @@ hostname (string): Hostname - @@ -2156,7 +2156,7 @@ python-dateutil-1.4.1-1.20 Source: live Period: 2012-01-12 14:10:56 - end Nodes: &node1; -Groups: +Groups: Resources: diff --git a/xml/ha_docupdates.xml b/xml/ha_docupdates.xml index 7a2b0c923..ba192ed04 100644 --- a/xml/ha_docupdates.xml +++ b/xml/ha_docupdates.xml @@ -693,7 +693,7 @@ toms 2014-08-12: The chapter has been renamed . - How to manually install the &hasi; and how to automatically + How to manually install &productname; and how to automatically set up a cluster with the bootstrap scripts has moved into the new &haquick; (Fate#320823). diff --git a/xml/ha_drbd.xml b/xml/ha_drbd.xml index 9f3986a21..c136d4d03 100644 --- a/xml/ha_drbd.xml +++ b/xml/ha_drbd.xml @@ -156,9 +156,9 @@ NAME SIZELIMIT OFFSET AUTOCLEAR RO BACK-FILE Installing DRBD Services - Install the &hasi; on both &sls; machines in your networked + Install the &ha; pattern on both &sls; machines in your networked cluster as described in . Installing - &hasi; also installs the DRBD program files. + the pattern also installs the DRBD program files. @@ -761,8 +761,8 @@ r0 role:Primary Migrating from DRBD 8 to DRBD 9 - Between DRBD 8 (shipped with &sle; &hasi; 12 SP1) and - DRBD 9 (shipped with &sle; &hasi; 12 SP2), the metadata format + Between DRBD 8 (shipped with &productname; 12 SP1) and + DRBD 9 (shipped with &productname;12 SP2), the metadata format has changed. DRBD 9 does not automatically convert previous metadata files to the new format. diff --git a/xml/ha_example_gui_i.xml b/xml/ha_example_gui_i.xml index b55f5cd67..45b6ec3b3 100644 --- a/xml/ha_example_gui_i.xml +++ b/xml/ha_example_gui_i.xml @@ -107,7 +107,7 @@ The name and value are dependent on your hardware configuration and what you chose for the media configuration during the installation of - the &hasi; software. + the &ha; software. diff --git a/xml/ha_fencing.xml b/xml/ha_fencing.xml index 1a0c54d72..4d9f46bd4 100644 --- a/xml/ha_fencing.xml +++ b/xml/ha_fencing.xml @@ -84,7 +84,7 @@ In a Pacemaker cluster, the implementation of node level fencing is &stonith; - (Shoot The Other Node in the Head). The &hasi; + (Shoot The Other Node in the Head). &productname; includes the stonith command line tool, an extensible interface for remotely powering down a node in the cluster. For an overview of the available options, run stonith --help @@ -96,7 +96,7 @@ &stonith; Devices To use node level fencing, you first need to have a fencing device. To - get a list of &stonith; devices which are supported by the &hasi;, run + get a list of &stonith; devices which are supported by &productname;, run one of the following commands on any of the nodes: &prompt.root;stonith -L diff --git a/xml/ha_glossary.xml b/xml/ha_glossary.xml index 6d6b9c470..0a2e01caf 100644 --- a/xml/ha_glossary.xml +++ b/xml/ha_glossary.xml @@ -190,7 +190,7 @@ performance will be met during a contractual measurement period. The main management entity responsible for coordinating all non-local - interactions. The &hasi; uses Pacemaker as CRM. Each node of the + interactions. &productname; uses Pacemaker as CRM. Each node of the cluster has its own CRM instance, but the one running on the DC is the one elected to relay decisions to the other non-local CRMs and process their input. A CRM interacts with several components: local resource @@ -467,10 +467,9 @@ performance will be met during a contractual measurement period. A script acting as a proxy to manage a resource (for example, to start, - stop or monitor a resource). The &hasi; supports three different - kinds of resource agents: OCF (Open Cluster Framework), LSB (Linux - Standard Base init scripts), and &hb; resource agents. For more - information, refer to . + stop, or monitor a resource). &productname; supports different + kinds of resource agents. For details, see + . diff --git a/xml/ha_hawk2_cons_i.xml b/xml/ha_hawk2_cons_i.xml index 2603d4b2d..101b97c69 100644 --- a/xml/ha_hawk2_cons_i.xml +++ b/xml/ha_hawk2_cons_i.xml @@ -5,9 +5,9 @@ %entities; ]> - Configuring Constraints @@ -643,7 +643,7 @@ of the resources diminishes or they fail. - To take this into account, the &hasi; allows you to specify the following + To take this into account, &productname; allows you to specify the following parameters: diff --git a/xml/ha_hawk2_maintenance_i.xml b/xml/ha_hawk2_maintenance_i.xml index 6ea87df75..1f4a54512 100644 --- a/xml/ha_hawk2_maintenance_i.xml +++ b/xml/ha_hawk2_maintenance_i.xml @@ -25,7 +25,7 @@ &maint-mode-basics; - With regard to that, &hasi; provides maintenance options + &productname; provides maintenance options on several levels: @@ -99,7 +99,7 @@ Maintenance Mode. - From this point on, the resource will be managed by the &hasi; software + From this point on, the resource will be managed by the &ha; software again. @@ -201,7 +201,7 @@ this change. - From this point on, the &hasi; will take over cluster management again. + From this point on, the &ha; software will take over cluster management again. diff --git a/xml/ha_hawk2_manage_i.xml b/xml/ha_hawk2_manage_i.xml index a9abc317d..66117c28d 100644 --- a/xml/ha_hawk2_manage_i.xml +++ b/xml/ha_hawk2_manage_i.xml @@ -5,9 +5,9 @@ %entities; ]> - Managing Cluster Resources @@ -96,14 +96,14 @@ Do Not Touch Services Managed by the Cluster - When managing a resource via the &hasi;, the resource must not be started + When managing a resource with &productname;, the resource must not be started or stopped otherwise (outside of the cluster, for example manually or on - boot or reboot). The &hasi; software is responsible for all service start + boot or reboot). The &ha; software is responsible for all service start or stop actions. However, if you want to check if the service is configured properly, start - it manually, but make sure that it is stopped again before the &hasi; takes + it manually, but make sure that it is stopped again before the &ha; software takes over. diff --git a/xml/ha_hawk2_rsc_i.xml b/xml/ha_hawk2_rsc_i.xml index bba148ec4..2670a8e9d 100644 --- a/xml/ha_hawk2_rsc_i.xml +++ b/xml/ha_hawk2_rsc_i.xml @@ -5,9 +5,9 @@ %entities; ]> - Configuring Cluster Resources @@ -760,7 +760,7 @@ Configuring Resource Monitoring - The &hasi; does not only detect node failures, but also when an individual + &productname; not only detects node failures, but also when an individual resource on a node has failed. If you want to ensure that a resource is running, configure resource monitoring for it. Usually, resources are only monitored by the cluster while they are running. However, to detect diff --git a/xml/ha_hawk_rsc_config_i.xml b/xml/ha_hawk_rsc_config_i.xml index 04c0c3ccc..d999927e9 100644 --- a/xml/ha_hawk_rsc_config_i.xml +++ b/xml/ha_hawk_rsc_config_i.xml @@ -81,7 +81,7 @@ Configuring Resources with the Setup Wizard - The &hasi; comes with a predefined set of templates for some + &productname; comes with a predefined set of templates for some frequently used cluster scenarios, for example, setting up a highly available NFS server. Find the predefined templates in the hawk-templates package. You can @@ -96,7 +96,7 @@ text in &hawk2;. - Availability of Templates @@ -105,7 +105,7 @@ See for details. - In the following procedure, we will use the wizard to configure an NFS @@ -384,7 +384,7 @@ You have successfully configured an NFS(v4/v3) failover server. - @@ -562,8 +562,8 @@ - @@ -801,7 +801,7 @@ Learn how to create the different types of constraints in the following procedures. - @@ -1323,7 +1323,7 @@ performance of the resources diminishes or they fail. - To take this into account, the &hasi; allows you to specify the + To take this into account, &productname; allows you to specify the following parameters: @@ -1345,7 +1345,7 @@ Utilization attributes are used to configure both the resource's - requirements and the capacity a node provides. The &hasi; now also + requirements and the capacity a node provides. &productname; now also provides means to detect and configure both node capacity and resource requirements automatically. For more details and a configuration example, refer to . @@ -1423,7 +1423,7 @@ Configuring Resource Monitoring - The &hasi; cannot only detect a node failure, but also when an + &productname; can not only detect a node failure, but also when an individual resource on a node has failed. If you want to ensure that a resource is running, configure resource monitoring for it. For resource monitoring, specify a timeout and/or start delay value, and an interval. @@ -1568,7 +1568,7 @@ . - Adding a Resource Group diff --git a/xml/ha_hawk_rsc_manage_i.xml b/xml/ha_hawk_rsc_manage_i.xml index 0f6e9ee65..6a207b248 100644 --- a/xml/ha_hawk_rsc_manage_i.xml +++ b/xml/ha_hawk_rsc_manage_i.xml @@ -81,9 +81,9 @@ Do Not Touch Services Managed by the Cluster - When managing a resource via the &hasi;, the same resource must not + When managing a resource with &productname;, the same resource must not be started or stopped otherwise (outside of the cluster, for example - manually or on boot or reboot). The &hasi; software is responsible + manually or on boot or reboot). The &ha; software is responsible for all service start or stop actions. @@ -224,7 +224,7 @@ the message that appears. - - &hasi; ships with a comprehensive set of tools to assists you in + &productname; ships with a comprehensive set of tools to assists you in managing your cluster from the command line. This chapter introduces the tools needed for managing the cluster configuration in the CIB and the cluster resources. Other command line tools for managing resource agents @@ -125,7 +125,7 @@ from the book, except for a general overview--> database (CIB) for consistency and other problems. It can check a file containing the configuration or connect to a running cluster. It reports two classes of problems. Errors must be fixed before the - &hasi; can work properly while warning resolution is up to the + &ha; software can work properly while warning resolution is up to the administrator. crm_verify assists in creating new or modified configurations. You can take a local copy of a CIB in the running cluster, edit it, validate it using diff --git a/xml/ha_migration.xml b/xml/ha_migration.xml index 24536e20e..715e22b08 100644 --- a/xml/ha_migration.xml +++ b/xml/ha_migration.xml @@ -125,7 +125,7 @@ - The &hasi; has the same supported upgrade paths as the underlying base system. For a complete + &productname; has the same supported upgrade paths as the underlying base system. For a complete overview, see the section Supported Upgrade Paths to &sls; &productnumber; in the @@ -486,9 +486,9 @@ Upgrading from Product Version 11 to 12: Cluster Offline Upgrade - - The &hasi; 12 cluster stack comes with major changes in various - components (for example, &corosync.conf;, disk formats of OCFS2). + + &productname; 12 cluster stack comes with major changes in various + components (for example, &corosync.conf;, disk formats of OCFS2). Therefore, a cluster rolling upgrade from any &productname; 11 version is not supported. Instead, all cluster nodes must be offline and the cluster needs to be upgraded as a whole as described below. diff --git a/xml/ha_ocfs2.xml b/xml/ha_ocfs2.xml index c5bb744a8..74e79d5f6 100644 --- a/xml/ha_ocfs2.xml +++ b/xml/ha_ocfs2.xml @@ -143,7 +143,7 @@ The &ocfs; Kernel module (ocfs2) is installed - automatically in the &hasi; on &slsreg; &productnumber;. To use + automatically in &productname; &productnumber;. To use &ocfs;, make sure the following packages are installed on each node in the cluster: ocfs2-tools and the matching ocfs2-kmp-* diff --git a/xml/ha_storage_protection.xml b/xml/ha_storage_protection.xml index 2a520309a..3c4bb056c 100644 --- a/xml/ha_storage_protection.xml +++ b/xml/ha_storage_protection.xml @@ -394,7 +394,7 @@ stonith-timeout = Timeout (msgwait) + 20% watchdog module. - The &hasi; uses the SBD daemon as the software component that feeds + &productname; uses the SBD daemon as the software component that feeds the watchdog. diff --git a/xml/ha_troubleshooting.xml b/xml/ha_troubleshooting.xml index 99b42f388..c0a3b8a61 100644 --- a/xml/ha_troubleshooting.xml +++ b/xml/ha_troubleshooting.xml @@ -45,11 +45,10 @@ The packages needed for configuring and managing a cluster are included in the High Availability installation - pattern, available with the &hasi;. + pattern, available with &productname;. - Check if &hasi; is installed as an extension to &sls; - &productnumber; on each of the cluster nodes and if the + Check if &productname; is installed on each of the cluster nodes and if the High Availability pattern is installed on each of the machines as described in the &haquick;. diff --git a/xml/phrases-decl.ent b/xml/phrases-decl.ent index 4c03c3a0c..cc30ff4e1 100644 --- a/xml/phrases-decl.ent +++ b/xml/phrases-decl.ent @@ -1,7 +1,7 @@ @@ -71,7 +71,7 @@ "Allow interaction with the in-kernel connection tracking system for enabling stateful packet - inspection for iptables. Used by the &hasi; to synchronize the connection + inspection for iptables. Used by &productname; to synchronize the connection status between cluster nodes."> - - + + - +