diff options
| -rw-r--r-- | install/ui/src/freeipa/topology.js | 25 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/internal.py | 4 |
3 files changed, 22 insertions, 11 deletions
diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js index ae94f983c..7559d78e5 100644 --- a/install/ui/src/freeipa/topology.js +++ b/install/ui/src/freeipa/topology.js @@ -501,23 +501,34 @@ topology.servers_search_facet = function(spec, no_init) { // Do not show warning if there is only one master if (result.length <= 1) return; - var counter = 0; + var ca_counter = 0; + var kra_counter = 0; for (var i=0, l=result.length; i<l; i++) { var current = result[i]; var roles = current.result.enabled_role_servrole; for (var k=0, m=roles.length; k<m; k++) { - if (roles[k] === 'CA server') counter++; + if (roles[k] === 'CA server') ca_counter++; + if (roles[k] === 'KRA server') kra_counter++; } } - // Create dialog and show it only when there is only one CA server - if (counter != 1) return; + // Show a dialog when there is only one CA or KRA server + if (ca_counter != 1 && kra_counter != 1) return; + + var message = text.get( + '@i18n:objects.servers.svc_warning_message') + '<ul>'; + if (ca_counter === 1) { + message += '<li>CA</li>\n'; + } + if (kra_counter === 1) { + message += '<li>KRA</li>\n'; + } + message += '</ul>'; - var message = text.get('@i18n:objects.servers.ca_warning_message'); var dialog = IPA.dialog({ - name: 'ca_warning', - title: '@i18n:objects.servers.ca_warning_title', + name: 'svc_warning', + title: '@i18n:objects.servers.svc_warning_title', sections: [ { show_header: false, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 7d5b32b2e..820f7aa77 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -556,8 +556,8 @@ "label_singular": "Server Role", }, "servers": { - "ca_warning_message": "It is strongly recommended to keep the CA services installed on more than one server.", - "ca_warning_title": "Warning: Only One CA Server Detected", + "svc_warning_title": "Warning: Consider service replication", + "svc_warning_message": "It is strongly recommended to keep the following services installed on more than one server:", "remove_server": "Delete Server", "remove_server_msg": "Deleting a server removes it permanently from the topology. Note that this is a non-reversible action." }, diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index a0bfa5589..5e70a79e4 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -737,8 +737,8 @@ class i18n_messages(Command): "label_singular": _("Server Role"), }, "servers": { - "ca_warning_message": _("It is strongly recommended to keep the CA services installed on more than one server."), - "ca_warning_title": _("Warning: Only One CA Server Detected"), + "svc_warning_title": _("Warning: Consider service replication"), + "svc_warning_message": _("It is strongly recommended to keep the following services installed on more than one server:"), "remove_server": _("Delete Server"), "remove_server_msg": _("Deleting a server removes it permanently from the topology. Note that this is a non-reversible action.") }, |