Merge pull request #7 from johnmccabe/maint/master/flag_vanagon_frankenbuilder_vms

(maint) allow vm name to be overridden for roles

Author: johnmccabe

vmpooler-bitbar.30s.rb

@@ -50,6 +50,19 @@ def copy_menu_text_params(menu_text)
       "bash=/bin/bash param1=-c param2='echo -n #{menu_text} | pbcopy' terminal=false"
     end
 
+    def get_display_name(vm)
+      # list of roles which override the vm[:name] displayed
+      flagged_roles = ['vanagon_target']
+      if vm[:tags].key?('roles')
+        flagged_roles.each do | flagged_role |
+          if vm[:tags]['roles'].include?(flagged_role)
+            return flagged_role
+          end
+        end
+      end
+      vm[:name]
+    end
+
     def ssh_user(vm)
       vm[:template].start_with?('win') ? 'Administrator' : 'root'
     end
@@ -81,7 +94,7 @@ def ssh_user(vm)
 <% if !vms.nil? -%>
 <%   vms.each do |vm| -%>
 <%     remaining_time_colour = vm[:remaining] <= warning_timeleft_threshhold ? 'red' : 'green' -%>
-<%= vm[:timebar] %><%= vm[:hostname] %> (<%= vm[:name] %>) | <%= fixed_font_header_params %> color=<%= remaining_time_colour %> <%= copy_menu_text_params(vm[:fqdn]) %>
+<%= vm[:timebar] %><%= vm[:hostname] %> (<%= get_display_name(vm) %>) | <%= fixed_font_header_params %> color=<%= remaining_time_colour %> <%= copy_menu_text_params(vm[:fqdn]) %>
 -- Action | <%= submenu_header_params %>
 -- SSH to VM | href='ssh://<%= ssh_user(vm) %>@<%= vm[:fqdn] %>' <%= terminal_action_params %>
 -- Delete VM | bash=<%= this_script %> param1=delete param2=<%= vm[:hostname] %> <%= refresh_action_params %>