Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/design-old.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ There are five conceptual areas of functionality:
# "Scaffolding" (init script, user authentication, build infrastructure, internationalization, etc.)
# Cluster Status Display (what resources/nodes are online, current status thereof, history, etc.)
# Basic Operator Tasks (start/stop resources, online/offline nodes, etc.)
# Configure Cluster (add/remove node/resource, set cluster options, configure STONITH, etc.)
# Configure Cluster (add/remove node/resource, set cluster options, configure FENCING, etc.)
# Explore Failure Scenarios (see what ''would'' happen if a resource/node failed)

In terms of implementation, these all overlap (management tasks build on the status display, everything builds on scaffolding), but it's useful to break them up like this because:
Expand Down Expand Up @@ -154,7 +154,7 @@ Areas for further work:
== Configure Cluster ==

* Create/Delete Resource
* Configure STONITH (just create a STONITH resource, right?)
* Configure FENCING (just create a FENCING resource, right?)
* Create/Delete Groups, Clones, M/S resources
* Configure cluster properties
* Configure op & resource defaults ''(not yet implemented)''
Expand Down
2 changes: 1 addition & 1 deletion doc/design-wizard.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ minimal implementation (workflow):

other setup:
- walkthrough of initial cluster setup options:
- STONITH enabled / STONITH resource configured
- FENCING enabled / FENCING resource configured
- stickiness etc.

Experience is thus:
Expand Down
2 changes: 1 addition & 1 deletion doc/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ in any of the tests.
=== Basic Management Operations

_Note_: This requires a cluster with at least two nodes, a single
primitive, a group, a clone, a promotable set, and working STONITH.
primitive, a group, a clone, a promotable set, and working FENCING.
We assume everything is running at the start of this test.

. Log in as "hacluster".
Expand Down
30 changes: 15 additions & 15 deletions e2e_test/hawk_test_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
class Error:
MAINT_TOGGLE_ERR = "Could not find Switch to Maintenance toggle button for node"
PRIMITIVE_TARGET_ROLE_ERR = "Couldn't find value [Started] for primitive target-role"
STONITH_ERR = "Couldn't find stonith-sbd menu to place it in maintenance mode"
FENCING_ERR = "Couldn't find stonith-sbd menu to place it in maintenance mode"
COOL_PRIMITIVE_ERR = "Couldn't find cool_primitive menu to edit"
HOT_PRIMITIVE_ERR = "Couldn't find hot_primitive menu to edit"
DUMMY_PRIMITIVE_ERR = "Couldn't find hot_primitive menu to edit"
STONITH_ERR_OFF = "Could not find Disable Maintenance Mode button for stonith-sbd"
FENCING_ERR_OFF = "Could not find Disable Maintenance Mode button for stonith-sbd"
CRM_CONFIG_ADVANCED_ATTRIBUTES = "crm_config dropdown box shows the advanced attributes, but shouldn't"


Expand All @@ -53,7 +53,7 @@ class Xpath:
HREF_CRM_CONFIG_EDIT = '//a[contains(@href, "crm_config/edit")]'
HREF_CRM_CONFIG_FENCE_REACTION = '//option[contains(@value, "fence-reaction")]'
HREF_CRM_CONFIG_NO_QUORUM_POLICY = '//option[contains(@value, "no-quorum-policy")]'
HREF_CRM_CONFIG_STONITH_ACTION = '//option[contains(@value, "stonith-action")]'
HREF_CRM_CONFIG_FENCING_ACTION = '//option[contains(@value, "stonith-action")]'
HREF_CRM_CONFIG_NODE_HEALTH_STRATEGY = '//option[contains(@value, "node-health-strategy")]'
HREF_CRM_CONFIG_NODE_PLACEMENT_STRATEGY = '//option[contains(@value, "placement-strategy")]'
HREF_CONSTRAINTS = '//a[contains(@href, "#constraints")]'
Expand All @@ -71,13 +71,13 @@ class Xpath:
NODE_READY = '//a[contains(@href, "ready") and contains(@title, "Switch to ready")]'
OCF_OPT_LIST = '//option[contains(@value, "ocf")]'
OPERATIONS = '//*[@id="nodes"]/div[1]/div[2]/div[2]/table/tbody/tr[1]/td[5]/div/div/button'
OPT_STONITH = '//option[contains(@value, "stonith-sbd")]'
OPT_FENCING = '//option[contains(@value, "stonith-sbd")]'
RESOURCES_TYPES = '//a[contains(@href, "resources/types")]'
RSC_OK_SUBMIT = '//input[contains(@class, "submit")]'
RSC_ROWS = '//*[@id="resources"]/div[1]/div[2]/div[2]/table/tbody/tr'
STONITH_CHKBOX = '//input[contains(@type, "checkbox") and contains(@value, "stonith-sbd")]'
STONITH_MAINT_OFF = '//a[contains(@href, "stonith-sbd") and contains(@title, "Disable Maintenance Mode")]'
STONITH_MAINT_ON = '//a[contains(@href, "stonith-sbd/maintenance_on")]'
FENCING_CHKBOX = '//input[contains(@type, "checkbox") and contains(@value, "stonith-sbd")]'
FENCING_MAINT_OFF = '//a[contains(@href, "stonith-sbd") and contains(@title, "Disable Maintenance Mode")]'
FENCING_MAINT_ON = '//a[contains(@href, "stonith-sbd/maintenance_on")]'
COOL_PRIMITIVE_EDIT = '//a[contains(@href, "cool_primitive/edit")]'
HOT_PRIMITIVE_EDIT = '//a[contains(@href, "hot_primitive/edit")]'
DUMMY_PRIMITIVE_EDIT = '//a[contains(@href, "dummy_primitive/edit")]'
Expand Down Expand Up @@ -341,7 +341,7 @@ def test(self, testname, results, *extra):

def test_set_stonith_maintenance(self):
'''
Set STONITH/sbd in maintenance. Assumes stonith-sbd resource is the last one listed on the
Set FENCING/sbd in maintenance. Assumes stonith-sbd resource is the last one listed on the
resources table
Returns:
boolean: True if successful or False if failed
Expand All @@ -352,8 +352,8 @@ def test_set_stonith_maintenance(self):
if not totalrows:
totalrows = 1
print("TEST: test_set_stonith_maintenance: Placing stonith-sbd in maintenance")
self.check_and_click_by_xpath(Error.STONITH_ERR, [Xpath.DROP_DOWN_FORMAT.format(totalrows),
Xpath.STONITH_MAINT_ON, Xpath.COMMIT_BTN_DANGER])
self.check_and_click_by_xpath(Error.FENCING_ERR, [Xpath.DROP_DOWN_FORMAT.format(totalrows),
Xpath.FENCING_MAINT_ON, Xpath.COMMIT_BTN_DANGER])
if self.verify_success():
print("INFO: stonith-sbd successfully placed in maintenance mode")
return True
Expand All @@ -362,12 +362,12 @@ def test_set_stonith_maintenance(self):

def test_disable_stonith_maintenance(self):
'''
Disable maintenance in STONITH/sbd
Disable maintenance in FENCING/sbd
Returns:
boolean: True if successful or False if failed
'''
print("TEST: test_disable_stonith_maintenance: Re-activating stonith-sbd")
self.check_and_click_by_xpath(Error.STONITH_ERR_OFF, [Xpath.STONITH_MAINT_OFF, Xpath.COMMIT_BTN_DANGER])
self.check_and_click_by_xpath(Error.FENCING_ERR_OFF, [Xpath.FENCING_MAINT_OFF, Xpath.COMMIT_BTN_DANGER])
if self.verify_success():
print("INFO: stonith-sbd successfully reactivated")
return True
Expand Down Expand Up @@ -851,7 +851,7 @@ def test_add_clone(self, clone):
return False
elem.send_keys(clone)
self.check_and_click_by_xpath(f"while adding clone [{clone}]",
[Xpath.CLONE_CHILD, Xpath.OPT_STONITH, Xpath.TARGET_ROLE_FORMAT.format('clone'),
[Xpath.CLONE_CHILD, Xpath.OPT_FENCING, Xpath.TARGET_ROLE_FORMAT.format('clone'),
Xpath.TARGET_ROLE_STARTED, Xpath.RSC_OK_SUBMIT])
if self.verify_success():
print(f"INFO: Successfully added clone [{clone}] of [stonith-sbd]")
Expand All @@ -878,7 +878,7 @@ def test_add_group(self, group):
return False
elem.send_keys(group)
self.check_and_click_by_xpath(f"while adding group [{group}]",
[Xpath.STONITH_CHKBOX, Xpath.TARGET_ROLE_FORMAT.format('group'),
[Xpath.FENCING_CHKBOX, Xpath.TARGET_ROLE_FORMAT.format('group'),
Xpath.TARGET_ROLE_STARTED, Xpath.RSC_OK_SUBMIT])
if self.verify_success():
print(f"INFO: Successfully added group [{group}] of [stonith-sbd]")
Expand Down Expand Up @@ -969,7 +969,7 @@ def test_check_cluster_configuration(self, ssh):
# and a select in the crm_attribute. Let's not overengineer.)
elem.click()
for xref in [Xpath.HREF_CRM_CONFIG_NO_QUORUM_POLICY,
Xpath.HREF_CRM_CONFIG_STONITH_ACTION,
Xpath.HREF_CRM_CONFIG_FENCING_ACTION,
Xpath.HREF_CRM_CONFIG_NODE_HEALTH_STRATEGY,
Xpath.HREF_CRM_CONFIG_NODE_PLACEMENT_STRATEGY]:
self.check_and_click_by_xpath(f'Couldn\'t find {xref} resource in the drop-down list',
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/ar/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['ar'] = {
null,
"الدور"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"تم تمكين STONITH"
"تم تمكين FENCING"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/cs/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,9 @@ var locales = locales || {}; locales['cs'] = {
null,
"Role"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH povolen"
"FENCING povolen"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/de/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['de'] = {
null,
"Rolle"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH aktiviert"
"FENCING aktiviert"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/es/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['es'] = {
null,
"Función"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH habilitado"
"FENCING habilitado"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/fr/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['fr'] = {
null,
"Rôle"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH activé"
"FENCING activé"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/hu/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['hu'] = {
null,
"Szerep"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH engedélyezve"
"FENCING engedélyezve"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/it/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['it'] = {
null,
"Ruolo"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH abilitato"
"FENCING abilitato"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/ja/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,9 @@ var locales = locales || {}; locales['ja'] = {
null,
"役割"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITHが有効です"
"FENCINGが有効です"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/ko/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,9 @@ var locales = locales || {}; locales['ko'] = {
null,
"역할"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH 활성화됨"
"FENCING 활성화됨"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/nl/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['nl'] = {
null,
"Rol"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH ingeschakeld"
"FENCING ingeschakeld"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/pl/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,9 @@ var locales = locales || {}; locales['pl'] = {
null,
"Rola"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"Włączone STONITH"
"Włączone FENCING"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/pt_BR/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['pt-BR'] = {
null,
"Função"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH Habilitado"
"FENCING Habilitado"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/ru/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,9 @@ var locales = locales || {}; locales['ru'] = {
null,
"Роль"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"Модуль STONITH включен"
"Модуль FENCING включен"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/sv/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1083,9 +1083,9 @@ var locales = locales || {}; locales['sv'] = {
null,
"Roll"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH aktiverat"
"FENCING aktiverat"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/zh_CN/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,9 @@ var locales = locales || {}; locales['zh-CN'] = {
null,
"角色"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"STONITH 已启用"
"FENCING 已启用"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/assets/javascripts/gettext/locale/zh_TW/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,9 @@ var locales = locales || {}; locales['zh-TW'] = {
null,
"角色"
],
"STONITH Enabled": [
"FENCING Enabled": [
null,
"已啟用 STONITH"
"已啟用 FENCING"
],
"SUSE, LLC": [
null,
Expand Down
4 changes: 2 additions & 2 deletions hawk/app/models/cib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ def initialize(id, user, pass, use_file = false, stonithwarning = false)
elsif operation == "stop"
# We have a failed stop, the resource is failed (bnc#879034)
state = :failed
# Also, the node is thus unclean if STONITH is enabled.
# Also, the node is thus unclean if FENCING is enabled.
node[:state] = :unclean if @crm_config[:stonith_enabled]
end
end
Expand Down Expand Up @@ -1181,7 +1181,7 @@ def initialize(id, user, pass, use_file = false, stonithwarning = false)
end

warning(
_("STONITH is disabled. For normal cluster operation, STONITH is required."),
_("FENCING is disabled. For normal cluster operation, FENCING is required."),
link: edit_cib_crm_config_path(cib_id: @id)
) unless @crm_config[:stonith_enabled] || !stonithwarning
end
Expand Down
2 changes: 1 addition & 1 deletion hawk/app/views/profiles/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="panel-body" style="overflow: inherit;">
<%= form_for [@cib, @profile], horizontal: true, bootstrap: true, method: :put do |main_form| %>
<%= main_form.select :language, :language_options, { include_hidden: false }, { } %>
<%= main_form.select :stonithwarning, { _("Yes") => true, _("No") => false }, { include_hidden: false }, label: _("Display warning if STONITH is disabled") %>
<%= main_form.select :stonithwarning, { _("Yes") => true, _("No") => false }, { include_hidden: false }, label: _("Display warning if FENCING is disabled") %>
<%= main_form.button_group do %>
<%= profile_apply_button(main_form, @profile) %>
<%= profile_revert_button(main_form, @profile) %>
Expand Down
2 changes: 1 addition & 1 deletion hawk/config/initializers/inflections.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
inflect.acronym "DC"
inflect.acronym "SAP"
inflect.acronym "NFS"
inflect.acronym "STONITH"
inflect.acronym "FENCING"
inflect.acronym "IP"
inflect.acronym "ID"
inflect.acronym "LVS"
Expand Down
8 changes: 4 additions & 4 deletions hawk/locale/ar/hawk.po
Original file line number Diff line number Diff line change
Expand Up @@ -2075,8 +2075,8 @@ msgid "Node \"%{node}\" is UNCLEAN and needs to be fenced."
msgstr "العقدة \"%{node}\" غير صحيحة وتحتاج إلى وضع فاصل."

#: ../app/models/cib.rb:1083
msgid "STONITH is disabled. For normal cluster operation, STONITH is required."
msgstr "تم تعطيل STONITH. STONITH مطلوب لعملية مجموعة متماثلة عادية."
msgid "FENCING is disabled. For normal cluster operation, FENCING is required."
msgstr "تم تعطيل FENCING. FENCING مطلوب لعملية مجموعة متماثلة عادية."

#: ../app/models/cib.rb:1210 ../app/models/cib.rb:1214
msgid "DRBD disk %{d} is %{s} on %{n}"
Expand Down Expand Up @@ -3041,8 +3041,8 @@ msgid "Copy"
msgstr "نسخ"

#: ../app/views/profiles/edit.html.erb:8
msgid "Display warning if STONITH is disabled"
msgstr "عرض تحذير بأنه تم تعطيل STONITH"
msgid "Display warning if FENCING is disabled"
msgstr "عرض تحذير بأنه تم تعطيل FENCING"

#: ../app/views/reports/display.html.erb:8
#: ../app/views/reports/index.html.erb:107
Expand Down
Loading