added ceph setup in eucalyptus installation
fixed conflict in node-controller recipe
Merge branch 'shaon-eucalyptuscephsetup' into testing