Merge pull request #45 from bodepd/diablo_final

Diablo final
derekhiggins · Mar 14, 2012 · 44984fd · 44984fd
2 parents 807a437 + 61b36b6
commit 44984fd
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 64 deletions.
diff --git a/lib/puppet/provider/nova_admin/default.rb b/lib/puppet/provider/nova_admin/default.rb
diff --git a/lib/puppet/provider/nova_admin/nova_manage.rb b/lib/puppet/provider/nova_admin/nova_manage.rb
@@ -2,9 +2,7 @@
 
   desc "Manage nova admin user"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     nova_manage("user", "list").match(/^#{resource[:name]}$/)

diff --git a/lib/puppet/provider/nova_config/parsed.rb b/lib/puppet/provider/nova_config/parsed.rb
@@ -14,7 +14,7 @@
   text_line :blank, :match => /^\s*$/;
 
   record_line :parsed,
-    :fields => %w{line}, 
+    :fields => %w{line},
     :match => /--(.*)/ ,
     :post_parse => proc { |hash|
       Puppet.debug("nova config line:#{hash[:line]} has been parsed") 

diff --git a/lib/puppet/provider/nova_network/default.rb b/lib/puppet/provider/nova_network/default.rb
diff --git a/lib/puppet/provider/nova_network/nova_manage.rb b/lib/puppet/provider/nova_network/nova_manage.rb
@@ -2,13 +2,14 @@
 
   desc "Manage nova network"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     begin
-      nova_manage("network", "list").match(/^#{resource[:network]}\/[0-9]{1,2} /)
+      network_list = nova_manage("network", "list")
+      return network_list.split("\n")[1..-1].detect do |n|
+        n =~ /^(\S+)\s+(#{resource[:network]})/
+      end
     rescue
       return false
     end

diff --git a/lib/puppet/provider/nova_project/default.rb b/lib/puppet/provider/nova_project/default.rb
diff --git a/lib/puppet/provider/nova_project/nova_manage.rb b/lib/puppet/provider/nova_project/nova_manage.rb
@@ -2,9 +2,7 @@
 
   desc "Manage nova project"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     nova_manage("project", "list").match(/^#{resource[:name]}$/)

diff --git a/manifests/manage/network.pp b/manifests/manage/network.pp
@@ -7,7 +7,6 @@
     ensure        => present,
     network       => $network,
     available_ips => $available_ips,
-    provider      => 'nova_manage',
     notify        => Exec["nova-db-sync"],
   }
 }
diff --git a/manifests/manage/project.pp b/manifests/manage/project.pp
@@ -5,7 +5,6 @@
 
   nova_project { $name:
     ensure   => present,
-    provider => 'nova_manage',
     owner    => $owner,
     notify   => Exec["nova-db-sync"],
     require  => Nova::Manage::Admin[$owner],

diff --git a/manifests/network/bridge.pp b/manifests/network/bridge.pp
@@ -1,7 +1,7 @@
 # bridge.pp
 define nova::network::bridge ( $ip, $netmask = "255.255.255.0" )
 {
-  case $operatingsystem {
+  case $::operatingsystem {
 
     'debian', 'ubuntu': {
       $context = "/files/etc/network/interfaces"

diff --git a/spec/unit/type/nova_config_spec.rb b/spec/unit/type/nova_config_spec.rb
@@ -15,7 +15,7 @@
     Puppet::Type.type(:nova_config).new(:name => 'foo', :ensure => :absent)
   end
   it 'should require a value when ensure is present' do
-    expect { Puppet::Type.type(:nova_config).new(:name => 'foo', :ensure => :present) }.should raise_error(Puppet::Error, 'Property value must be set when ensure is present')
+    expect { Puppet::Type.type(:nova_config).new(:name => 'foo', :ensure => :present) }.should raise_error(Puppet::Error, /Property value must be set/)
   end
   it 'should accept a valid value' do
     @nova_config[:value] = 'bar'