Merge pull request #160 from bodepd/folsom

Folsom

Author: bodepd

.fixtures.yml

@@ -6,5 +6,6 @@ fixtures:
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     "sysctl": "git://github.com/duritong/puppet-sysctl.git"
     "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq.git"
+    'inifile':  'git://github.com/cprice-puppet/puppetlabs-inifile'
   symlinks:
     "nova": "#{source_dir}"

examples/all.pp

@@ -71,8 +71,8 @@
 class { 'keystone':
   admin_token  => $keystone_admin_token,
   bind_host    => '127.0.0.1',
-  log_verbose  => true,
-  log_debug    => true,
+  verbose      => true,
+  debug        => true,
   catalog_type => 'sql',
 }
 # set up keystone admin users
@@ -97,8 +97,8 @@
 }
 
 class { 'glance::api':
-  log_verbose       => 'True',
-  log_debug         => 'True',
+  verbose           => 'True',
+  debug             => 'True',
   auth_type         => 'keystone',
   auth_host         => '127.0.0.1',
   auth_port         => '35357',
@@ -109,8 +109,8 @@
 class { 'glance::backend::file': }
 
 class { 'glance::registry':
-  log_verbose       => 'True',
-  log_debug         => 'True',
+  verbose           => 'True',
+  debug             => 'True',
   auth_type         => 'keystone',
   auth_host         => '127.0.0.1',
   auth_port         => '35357',

examples/multi.pp

@@ -91,8 +91,8 @@
   class { 'keystone':
     admin_token  => $keystone_admin_token,
     bind_host    => '127.0.0.1',
-    log_verbose  => true,
-    log_debug    => true,
+    verbose      => true,
+    debug        => true,
     catalog_type => 'sql',
   }
   # set up keystone admin users
@@ -117,8 +117,8 @@
   }
 
   class { 'glance::api':
-    log_verbose       => 'True',
-    log_debug         => 'True',
+    verbose           => 'True',
+    debug             => 'True',
     auth_type         => 'keystone',
     auth_host         => '127.0.0.1',
     auth_port         => '35357',
@@ -129,8 +129,8 @@
   class { 'glance::backend::file': }
 
   class { 'glance::registry':
-    log_verbose       => 'True',
-    log_debug         => 'True',
+    verbose           => 'True',
+    debug             => 'True',
     auth_type         => 'keystone',
     auth_host         => '127.0.0.1',
     auth_port         => '35357',

examples/site.pp

@@ -164,8 +164,8 @@
     password => 'keystone'
   }
   class { 'keystone':
-    log_verbose  => true,
-    log_debug    => true,
+    verbose      => true,
+    debug        => true,
     catalog_type => 'sql',
   }->
   class { 'keystone::mysql':

lib/puppet/provider/nova_config/parsed.rb

@@ -7,7 +7,6 @@
   :filetype => :flat
 ) do
 
-  confine :osfamily => [:debian] 
 
   #confine :exists => novaconf
   text_line :comment, :match => /^\s*#/;

lib/puppet/provider/nova_config/parsed_config.rb

@@ -7,7 +7,8 @@
   :filetype => :flat
 ) do
 
-  confine :osfamily => [:redhat]
+  confine :osfamily => [:debian, :redhat]
+  defaultfor :operatingsystem => :debian
 
   #confine :exists => novaconf
   text_line :comment, :match => /#|\[.*/;

lib/puppet/provider/nova_network/nova_manage.rb

@@ -38,9 +38,10 @@ def create
     end
 
     nova_manage('network', 'create',
-      "--label=#{resource[:label]}",
-      "--fixed_range_v4=#{resource[:name]}",
-      "--num_networks=#{resource[:num_networks]}",
+      resource[:label],
+      resource[:name],
+      resource[:num_networks],
+      resource[:network_size],
       optional_opts
     )
   end

lib/puppet/provider/nova_paste_api_ini/ini_setting.rb

@@ -0,0 +1,22 @@
+Puppet::Type.type(:nova_paste_api_ini).provide(
+  :ini_setting,
+  :parent => Puppet::Type.type(:ini_setting).provider(:ruby)
+) do
+
+  def section
+    resource[:name].split('/', 2).first
+  end
+
+  def setting
+    resource[:name].split('/', 2).last
+  end
+
+  def separator
+    '='
+  end
+
+  def file_path
+    '/etc/nova/api-paste.ini'
+  end
+
+end

lib/puppet/type/nova_network.rb

@@ -31,17 +31,17 @@
     desc 'project that the network is associated with'
   end
 
-  # we are not currently using this stuff
   newparam(:gateway) do
-
   end
 
   newparam(:dns2) do
-
   end
 
   newparam(:vlan_start) do
+  end
 
+  newparam(:network_size) do
+    defaultto('256')
   end
 
   validate do

lib/puppet/type/nova_paste_api_ini.rb

@@ -0,0 +1,18 @@
+Puppet::Type.newtype(:nova_paste_api_ini) do
+
+  ensurable
+
+  newparam(:name, :namevar => true) do
+    desc 'Section/setting name to manage from nova/paste-api.ini'
+    newvalues(/\S+\/\S+/)
+  end
+
+  newproperty(:value) do
+    desc 'The value of the setting to be defined.'
+    munge do |v|
+      v.to_s.strip
+    end
+  end
+
+
+end