mofa 0.3.2 → 0.3.3

data/lib/mofa/attributes_map.rb

@@ -12,7 +12,7 @@ class AttributesMap
     a.hostlist = hostlist
     a.token = token
     a.option_runlist = option_runlist
-    a.option_attributes = option_attributes
+    a.option_attributes = JSON.parse(option_attributes)
     a
   end
 
@@ -21,7 +21,7 @@ class AttributesMap
   end
 
   def generate
-    attr_all_roles = cookbook.mofa_yml.get_attr_for_role('all')
+    attr_all_roles = deep_merge(option_attributes, cookbook.mofa_yml.get_attr_for_role('all'))
     attr_all_roles_local = cookbook.mofa_yml_local.get_attr_for_role('all')
     attr_all_roles = deep_merge(attr_all_roles, attr_all_roles_local)
 

data/lib/mofa/cli.rb

@@ -19,6 +19,7 @@ module Mofa
     method_option :target, :type => :string, :aliases => '-t'
     method_option :concrete_target, :type => :string, :aliases => '-T'
     method_option :runlist, :type => :string, :aliases => '-o'
+    method_option :attributes, :type => :string, :aliases => '-j'
     method_option :service_hostlist_url, :type => :string
 
     def provision(cookbook_name_or_path)

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec