crowbar/barclamp-crowbar — pull request #664 by cloudedge (2013-08-22 04:10:19+00:00)
Title: Handle discovery data for nodes via merge and overaly node-role data view [1/3]

Changed the node.discovery= function to merge data into the existing data instead of replacing it.
This change was needed so that multiple jigs could update the discovered data without stomping
on each other.

This change was needed so that I could start working on inbound attributes (planned for Friday).

Also, added an example of the node-role edit data overlay page. This allows developers to add
custom screens for each role (like CB1 for proposals) instead of relying on the raw mode.

This is preliminary function but a good demonstration of the basic concept.

.../app/controllers/node_roles_controller.rb | 11 +++++++++
.../app/controllers/snapshots_controller.rb | 14 +++++++----
crowbar_framework/app/models/node.rb | 8 ++++---
crowbar_framework/app/models/snapshot.rb | 2 +-
.../app/views/deployments/show.html.haml | 2 +-
crowbar_framework/app/views/nodes/index.html.haml | 9 +++++++
.../app/views/snapshots/anneal.html.haml | 25 ++++++++++++++++----
.../app/views/snapshots/show.html.haml | 11 +++++++++
crowbar_framework/config/locales/crowbar/en.yml | 1 +
crowbar_framework/config/routes.rb | 2 +-
10 files changed, 69 insertions(+), 16 deletions(-)

Crowbar-Pull-ID: 4cf7281eca2d501acdae94e8a48c95d5944c55d7

Crowbar-Release: development