Merge pull request crowbar#57 from cloudedge/pull-req-master-b31953fd…

…68444974a559d04504aa59817e9d62ec crowbar#57 Merged by devtool for VictorLowther
zehicle · Jul 2, 2013 · 87779ab · 87779ab
2 parents 64ad2ee + 353237d
commit 87779ab
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 182 deletions.
diff --git a/bc-template-logging.json b/bc-template-logging.json
@@ -1,35 +1,5 @@
 {
-  "id": "bc-template-logging",
-  "description": "Centralized logging system based on syslog",
-  "attributes": {
-    "logging": {
-      "external_servers": [ ]
-    }
-  },
-  "roles": {
-      "logging-server": { "admin_implicit": true, "jig": "chef" },
-      "logging-client": { "implicit": true, "jig": "chef" }
-  },
-  "deployment": {
-    "logging": {
-      "crowbar-revision": 0,
-      "element_states": {
-        "logging-server": [ "readying", "ready", "applying" ],
-        "logging-client": [ "readying", "ready", "applying" ]
-      },
-      "elements": {},
-      "element_order": [
-        [ "logging-server", "logging-client" ]
-      ],
-      "config": {
-        "environment": "logging-base-config",
-        "mode": "full",
-        "transitions": true,
-        "transition_list": [
-          "discovered"
-        ]
-      }
-    }
-  }
+  "environment": "logging-base-config",
+  "mode": "full"
 }
 
diff --git a/chef/roles/logging-client/node-template.json b/chef/roles/logging-client/node-template.json
@@ -0,0 +1,3 @@
+{
+}
+
diff --git a/chef/roles/logging-client/role-template.json b/chef/roles/logging-client/role-template.json
@@ -0,0 +1,5 @@
+{
+  "environment": "logging-base-config",
+  "mode": "full"
+}
+
diff --git a/chef/roles/logging-server/node-template.json b/chef/roles/logging-server/node-template.json
@@ -0,0 +1,3 @@
+{
+}
+
diff --git a/chef/roles/logging-server/role-template.json b/chef/roles/logging-server/role-template.json
@@ -0,0 +1,5 @@
+{
+  "environment": "logging-base-config",
+  "mode": "full"
+}
+
diff --git a/crowbar.yml b/crowbar.yml
@@ -1,4 +1,4 @@
-# Copyright 2012, Dell
+# Copyright 2013, Dell
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Author: RobHirschfeld
-#
+
 
 barclamp:
   name: logging
@@ -28,11 +27,15 @@ barclamp:
   member:
     - crowbar
 
+jigs:
+  chef:
+    roles:
+      - logging-server
+      - logging-client
+
 crowbar:
-  layout: 1.9
+  layout: 2.0
   order: 40
-  run_order: 40
-  chef_order: 40
 
 rpms:
   pkgs:

diff --git a/crowbar_engine/barclamp_logging/db/migrate/20120801015037_barclamp_import_logging.rb b/crowbar_engine/barclamp_logging/db/migrate/20120801015037_barclamp_import_logging.rb
@@ -14,7 +14,7 @@
 #
 class BarclampImportLogging < ActiveRecord::Migration
   def up
-    Barclamp.import_1x 'logging'
+    Barclamp.import 'logging'
   end
 
   def down

diff --git a/crowbar_framework/app/controllers/logging_controller.rb b/crowbar_framework/app/controllers/logging_controller.rb
diff --git a/crowbar_framework/app/models/logging_service.rb b/crowbar_framework/app/models/logging_service.rb
diff --git a/crowbar_framework/app/views/barclamp/logging/_edit_deployment.html.haml b/crowbar_framework/app/views/barclamp/logging/_edit_deployment.html.haml
diff --git a/crowbar_framework/config/locales/logging/en.yml b/crowbar_framework/config/locales/logging/en.yml
diff --git a/crowbar_framework/db/migrate/20120801015037_barclamp_import_logging.rb b/crowbar_framework/db/migrate/20120801015037_barclamp_import_logging.rb