Description of problem:
The calamari api /api/v2/cluster/<fsid>/server returns OSD server names with crush bucket names appended.

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1. Create a cluster with say 1 mon and 1 osd node
2. Check the calamari api mentioned above (/api/v2/cluster/<fsid>/server)
3.

Actual results:
The output looks like below 

-----------------------------
[
    {
        "fqdn": "dhcp46-150.lab.eng.blr.redhat.com-general", 
        "hostname": "dhcp46-150.lab.eng.blr.redhat.com-general", 
        "services": [
            {
                "fsid": "f32fc340-779c-4233-bec3-d3a3ba354864", 
                "type": "osd", 
                "id": "0", 
                "running": true
            }
        ], 
        "frontend_addr": "10.70.46.150", 
        "backend_addr": "10.70.46.150", 
        "frontend_iface": null, 
        "backend_iface": null, 
        "managed": false, 
        "last_contact": null, 
        "boot_time": null, 
        "ceph_version": null
    }, 
    {
        "fqdn": "dhcp46-181.lab.eng.blr.redhat.com", 
        "hostname": "dhcp46-181.lab.eng.blr.redhat.com", 
        "services": [
            {
                "fsid": "f32fc340-779c-4233-bec3-d3a3ba354864", 
                "type": "mon", 
                "id": "dhcp46-181", 
                "running": true
            }, 
            {

Expected results:
The hostname and fqdn for the OSD nodes should not have appended "-general"


Additional info:
The snippet from de-compiled crushmap is as below 

-------------------------------------------------
# buckets
host dhcp46-150 {
        id -2           # do not change unnecessarily
        # weight 0.000
        alg straw
        hash 0  # rjenkins1
}
root default {
        id -1           # do not change unnecessarily
        # weight 0.000
        alg straw
        hash 0  # rjenkins1
        item dhcp46-150 weight 0.000
}
host dhcp46-150.lab.eng.blr.redhat.com-general {
        id -3           # do not change unnecessarily
        # weight 0.000
        alg straw
        hash 0  # rjenkins1
        item osd.0 weight 0.000
}
root general {
        id -4           # do not change unnecessarily
        # weight 0.000
        alg straw
        hash 0  # rjenkins1
        item dhcp46-150.lab.eng.blr.redhat.com-general weight 0.000
}
---------------------------