Bug 1323137

Summary: [Branding] Foreman server term should be replaced with Server in FDI
Product: Red Hat Satellite Reporter: Sachin Ghai <sghai>
Component: Discovery PluginAssignee: Lukas Zapletal <lzap>
Status: CLOSED ERRATA QA Contact: Sachin Ghai <sghai>
Severity: medium Docs Contact:
Priority: unspecified    
Version: 6.2.0CC: bbuckingham, bkearney, ehelms, lzap, mmccune, tmlcoch
Target Milestone: UnspecifiedKeywords: Triaged
Target Release: Unused   
Hardware: Unspecified   
OS: Unspecified   
URL: http://projects.theforeman.org/issues/14494
Whiteboard:
Fixed In Version: foreman-discovery-image-3.1.1-14 Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2016-07-27 11:03:48 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:
Attachments:
Description Flags
still can see Foreman URL on TUI of discovery image
none
foreman credentials replaced with server credentials none

Description Sachin Ghai 2016-04-01 11:11:28 UTC
Description of problem: 

While performing pxe-less discovery, the text-based screens use 'Foreman' instead of 'Satellite6'. I think this needs to be updated.

for example:

2. Foreman credentials screen header should be 'Satellite6 Credentials'
3. Foreman URL -> should be 'Satellite6 URL'
1. Manual/PXE-Less provisioning workflow screen contains a "setup foreman server credentials" -> should be "setup Satellite6 server credentials"
4. Primary interface screen -> connect to Foreman server -> should be Connection to Satellite6 server 


Version-Release number of selected component (if applicable):
Sat6.2 beta snap6

Comment 2 Shimon Shtein 2016-04-03 08:11:30 UTC
Currently the theme does not handle anything that is not shown on Foreman's web UI. @lzap, can you please ping me to see if we can do something in this area too? The alternative will be maintaining the changes to string in the code directly.

Comment 3 Lukas Zapletal 2016-04-04 08:20:55 UTC
Discovery image does not support i18n yet, therefore there are no means how we could deliver this. For this reason, I request postponing this to 6.3 as we need to introduce i18n chain and then request new translations.

Comment 4 Mike McCune 2016-04-06 05:19:05 UTC
What if we just removed the word 'Foreman' entirely on these screens so we don't have to brand them:

2. Foreman credentials screen header should be 'Satellite6 Credentials'

'Credentials'


3. Foreman URL -> should be 'Satellite6 URL'

"Server URL"

1. Manual/PXE-Less provisioning workflow screen contains a "setup foreman server credentials" -> should be "setup Satellite6 server credentials"

"setup server credentials"


4. Primary interface screen -> connect to Foreman server -> should be Connection to Satellite6 server 

"Connection to Server"

if that doesn't really work, I'm in favor of moving this to a later release if this introduces too much risk and pain in maintenance for the 6.2 line

Comment 5 Lukas Zapletal 2016-04-06 07:40:39 UTC
I can do that (http://projects.theforeman.org/issues/14494) but note the welcome message and status line at the top still says Foreman Discovery Image. That should not be rebranded, it's the package/project name.

Comment 6 Bryan Kearney 2016-04-06 08:05:14 UTC
Upstream bug component is Discovery Plugin

Comment 7 Lukas Zapletal 2016-04-06 12:15:38 UTC
I filed a PR that contains two commits (two upstream bugs):

Fixes #14494 - made texts branding-friendly

This fix removes Foreman words mostly from all strings and makes it 
"Satellite6" friendly.

Fixes #14495 - added i18n support

This patch adds full i18n support, but let's DO NOT pull this downstream
because it is too late, there are build and package changes and the 
patch touches lots of strings, so there might be typos. We'd need to 
cover entire possible workflow with image and we have about a dozen 
(PXE, PXE-less, TUI, non-interactive, combinations).

PLEASE ONLY CHERRY PICK THE UPSTREAM patch #14494

Comment 10 Lukas Zapletal 2016-05-18 09:35:31 UTC
Sorry Eric, this one was not yet merged upstream.

Comment 11 Lukas Zapletal 2016-05-19 14:23:59 UTC
Upstream merged, I split the PR into two, so the one which is linked with this BZ has only one commit (the correct one). So no special handling needed!

Merged as eac3d6d

Comment 12 Sachin Ghai 2016-06-16 09:39:15 UTC
I still can see Foreman URL instead of Server URL with sat6.2 beta2 snap15.2

 ~]# rpm -qa |grep discovery
foreman-discovery-image-3.1.1-12.el7sat.noarch
tfm-rubygem-foreman_discovery-5.0.0.8-1.el7sat.noarch
tfm-rubygem-hammer_cli_foreman_discovery-0.0.2.3-1.el7sat.noarch
rubygem-smart_proxy_discovery-1.0.3-3.el7sat.noarch

Comment 13 Sachin Ghai 2016-06-16 09:40:12 UTC
Created attachment 1168648 [details]
still can see Foreman URL on TUI of discovery image

Comment 16 Lukas Zapletal 2016-06-16 11:42:25 UTC
QA note: All "Foreman" texts should be gone, except two (we agreed on this upstream):

root/usr/lib64/ruby/vendor_ruby/discovery/menu.rb
131:  Newt::Screen.push_helpline("Foreman Discovery Image v#{fdi_version} (#{fdi_release})")

root/usr/lib64/ruby/vendor_ruby/discovery/screen/countdown.rb
21:  main_grid.wrapped_window("Welcome to Foreman Discovery")

Background version info and welcome message.

Comment 17 Tomas Mlcoch 2016-06-21 13:15:00 UTC
foreman-discovery-image-3.1.1-14 is available

Comment 19 Sachin Ghai 2016-07-08 10:36:43 UTC
Verified with sat62 GA snap19 having image ver: foreman-discovery-image-3.1.1-14

As per comment4, all occurrences of Foreman have been removed from FDI TUI interface. The image name at bottom of screen still uses Foreman-Discovery-Image but thats expected. Otherwise all changes have been verified. Thank you.

Comment 20 Sachin Ghai 2016-07-08 10:38:15 UTC
Created attachment 1177609 [details]
foreman credentials replaced with server credentials

Comment 21 Bryan Kearney 2016-07-27 11:03:48 UTC
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://access.redhat.com/errata/RHBA-2016:1501