1. Fixed side-effect of last commit.
2. added support of storage-scope
==============
Re-doing the calculation for num_osd. This issue is there when
 provisioned with "setup_interface: Yes".
Also fixed the issue for generating value of nfs_vm_host.

Change-Id: I8978710c45337ee48f5b6e48ddc9725fa1e47194
Merge "1. Fixed side-effect of last commit. 2. added support of storage-scope ============== Re-doing the calculation for num_osd. This issue is there when  provisioned with "setup_interface: Yes". Also fixed the issue for generating value of nfs_vm_host." into R1.10