diff --git a/core/rails/app/models/barclamp_rebar/ansible_playbook_jig.rb b/core/rails/app/models/barclamp_rebar/ansible_playbook_jig.rb
index 098035f7..a3697e25 100755
--- a/core/rails/app/models/barclamp_rebar/ansible_playbook_jig.rb
+++ b/core/rails/app/models/barclamp_rebar/ansible_playbook_jig.rb
@@ -240,7 +240,11 @@ def run(nr,data)
         end
         f.write("  roles:\n")
         role_role_map[nr.role.name].each do |rname|
-          f.write("  - #{rname}\n")
+          if rname.is_a?(String)
+            f.write("  - #{rname}\n")
+          else
+            f.write("  - { role: \"#{rname["role"]}\", when: \"#{rname["when"]}\" }\n")
+          end
         end
       end
     else