Fixing up issues from some mysterious rebase. [1/1]

Fixing up issues from some mysterious rebase.



 chef/cookbooks/clouderamanager/recipes/cm-api.rb   |  439 --------------------
 .../clouderamanager/recipes/configure-disks.rb     |   12 +
 crowbar.yml                                        |   14 +-
 3 files changed, 17 insertions(+), 448 deletions(-)

Crowbar-Pull-ID: a266564c5527daf993f9aa5b285186feac62ed20

Crowbar-Release: pebbles