domcleal

diff --git a/test/functional/compute_resources_controller_test.rb b/test/functional/compute_resources_controller_test.rb
index b7c3c89..566953a 100644
--- a/test/functional/compute_resources_controller_test.rb
+++ b/test/functional/compute_resources_controller_test.rb
@@ -4,6 +4,11 @@ class ComputeResourcesControllerTest < ActionController::TestCase
   setup do
     @compute_resource = compute_resources(:mycompute)
     @your_compute_resource = compute_resources(:yourcompute)
+    Fog.mock!
+  end

domcleal

diff --git a/app/views/compute_resources_vms/show.html.erb b/app/views/compute_resources_vms/show.html.erb
index cbabb9a..5463561 100644
--- a/app/views/compute_resources_vms/show.html.erb
+++ b/app/views/compute_resources_vms/show.html.erb
@@ -2,8 +2,10 @@
   <%= render "compute_resources_vms/show/#{@compute_resource.provider.downcase}" %>
 </div>
 
-<% title_actions *available_actions(@vm),
+<%

domcleal

# DomBot
#
# Enjoys following and target and firing many shots, marginally better, or
# worse, than seekj & destroy
class DomBot < RTanque::Bot::Brain
  NAME = 'DomBot'
  include RTanque::Bot::BrainHelper

  TURRET_FIRE_RANGE = RTanque::Heading::ONE_DEGREE * 5.0

domcleal

Deface::Override.new(:virtual_path => "dashboard/_status_table",
                     :name => "add_dashboard_table",
                     :insert_after => "ul:last",
                   :text => "
<h4 class='header'><%= _('Host Pool') %></h4>
<ul>
  <li>
    <%= link_to(_('Unassigned hosts'), discovers_path, :class=>'dashboard-links' ) %>
    <h4><%= Host::Discovered.count %></h4>
  </li>

domcleal

#!/usr/bin/env ruby

# If copying this template by hand, replace the settings below including the angle brackets
SETTINGS = {
  :url          => "https://foreman.fm.example.net",  # e.g. https://foreman.example.com
  :puppetdir    => "/var/lib/puppet",  # e.g. /var/lib/puppet
  :facts        => true,          # true/false to upload facts
  :timeout      => 10,
  # if CA is specified, remote Foreman host will be verified
  :ssl_ca       => "/var/lib/puppet/ssl/certs/ca.pem",      # e.g. /var/lib/puppet/ssl/certs/ca.pem

domcleal

diff --git a/app/views/compute_resources_vms/index/_vmware.html.erb b/app/views/compute_resources_vms/index/_vmware.html.erb
index 2d6177a..0a04b39 100644
--- a/app/views/compute_resources_vms/index/_vmware.html.erb
+++ b/app/views/compute_resources_vms/index/_vmware.html.erb
@@ -12,7 +12,7 @@
   <tbody>
   <% @vms.each do |vm| -%>
     <tr>
-      <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) %></td>
+      <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity) rescue raise("vm: #{vm.name} (#{vm.identity}, #{vm.send(:raw)})") %></td>

domcleal

diff --git a/db/migrate/20100523114430_add_ubuntu_custom_lvm_ptable.rb b/db/migrate/20100523114430_add_ubuntu_custom_lvm_ptable.rb
index 786219c..93920e5 100644
--- a/db/migrate/20100523114430_add_ubuntu_custom_lvm_ptable.rb
+++ b/db/migrate/20100523114430_add_ubuntu_custom_lvm_ptable.rb
@@ -1,6 +1,6 @@
 class AddUbuntuCustomLvmPtable < ActiveRecord::Migration
   def self.up
-    Ptable.create :name => "Ubuntu custom LVM", :layout => <<EOF
+    p = Ptable.new :name => "Ubuntu custom LVM", :layout => <<EOF
 d-i partman-auto/disk string /dev/sda

domcleal

  def require_ip_validation?
    # if it's not managed there's nowhere to specify an IP anyway
    return false unless managed?
    # if the CR will provide an IP, then don't validate yet
    return false if compute? && compute_resource.provided_attributes.keys.include?(:ip)
    ip_for_dns = (subnet.present? && subnet.dns_id.present?) || (domain.present? && domain.dns_id.present?)
    ip_for_dhcp = subnet.present? && subnet.dhcp_id.present?
    ip_for_token = Setting[:token_duration] == 0 && !capabilities.include?(:image)
    # Any of these conditions will require an IP, so chain with OR
    ip_for_dns or ip_for_dhcp or ip_for_token

domcleal

# -*- mode: ruby -*-
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
  # All Vagrant configuration is done here. The most common configuration
  # options are documented and commented below. For a complete reference,
  # please see the online documentation at vagrantup.com.

  # Every Vagrant virtual environment requires a box to build off of.
  config.vm.box = "centos-64-x64-kvm-2"

domcleal

  1) Failure:
Api::V1::ConfigTemplatesControllerTest#test_0008_should destroy [/home/dcleal/code/foreman/foreman/test/functional/api/v1/config_templates_controller_test.rb:60]:
Expected response to be a <:ok>, but was <500>

  2) Failure:
Api::V2::ConfigTemplatesControllerTest#test_0008_should destroy [/home/dcleal/code/foreman/foreman/test/functional/api/v2/config_templates_controller_test.rb:60]:
Expected response to be a <:ok>, but was <500>

  3) Failure:
ConfigTemplatesControllerTest#test_destroy [/home/dcleal/code/foreman/foreman/test/functional/config_templates_controller_test.rb:55]: