]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Add api_paste type/provider for Ceilometer
authorZhongShengping <chdzsp@163.com>
Fri, 26 Feb 2016 23:25:53 +0000 (07:25 +0800)
committerZhongShengping <chdzsp@163.com>
Tue, 8 Mar 2016 14:25:49 +0000 (22:25 +0800)
Add ceilometer_api_paste_ini type/provider for Ceilometer.
Also add the capability to configure api-paste.ini with config.pp.
Closes-bug: #1483371

Change-Id: I7a5ce9629b9069495e233a4576742aeb171a09c1

lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb [new file with mode: 0644]
lib/puppet/type/ceilometer_api_paste_ini.rb [new file with mode: 0644]
manifests/config.pp
spec/unit/provider/ceilometer_api_paste_ini/ini_setting_spec.rb [new file with mode: 0644]
spec/unit/type/ceilometer_api_paste_ini_spec.rb [new file with mode: 0644]

diff --git a/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb b/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
new file mode 100644 (file)
index 0000000..5ff506b
--- /dev/null
@@ -0,0 +1,27 @@
+Puppet::Type.type(:ceilometer_api_paste_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 self.file_path
+    '/etc/ceilometer/api-paste.ini'
+  end
+
+  # added for backwards compatibility with older versions of inifile
+  def file_path
+    self.class.file_path
+  end
+
+end
diff --git a/lib/puppet/type/ceilometer_api_paste_ini.rb b/lib/puppet/type/ceilometer_api_paste_ini.rb
new file mode 100644 (file)
index 0000000..ad0ebf2
--- /dev/null
@@ -0,0 +1,52 @@
+Puppet::Type.newtype(:ceilometer_api_paste_ini) do
+
+  ensurable
+
+  newparam(:name, :namevar => true) do
+    desc 'Section/setting name to manage from /etc/ceilometer/api-paste.ini'
+    newvalues(/\S+\/\S+/)
+  end
+
+  newproperty(:value) do
+    desc 'The value of the setting to be defined.'
+    munge do |value|
+      value = value.to_s.strip
+      value.capitalize! if value =~ /^(true|false)$/i
+      value
+    end
+
+    def is_to_s( currentvalue )
+      if resource.secret?
+        return '[old secret redacted]'
+      else
+        return currentvalue
+      end
+    end
+
+    def should_to_s( newvalue )
+      if resource.secret?
+        return '[new secret redacted]'
+      else
+        return newvalue
+      end
+    end
+  end
+
+  newparam(:secret, :boolean => true) do
+    desc 'Whether to hide the value from Puppet logs. Defaults to `false`.'
+
+    newvalues(:true, :false)
+
+    defaultto false
+  end
+
+  newparam(:ensure_absent_val) do
+    desc 'A value that is specified as the value property will behave as if ensure => absent was specified'
+    defaultto('<SERVICE DEFAULT>')
+  end
+
+  autorequire(:package) do
+    'ceilometer'
+  end
+
+end
index c1d1332123ff16788b2ba7ad860b3d944e3f5002..9c46bcdfdb889bcbef0a2ae1eaae985383ea6646 100644 (file)
 #     DEFAULT/bar:
 #       value: barValue
 #
+# [*ceilometer_api_paste_ini*]
+#   (optional) Allow configuration of /etc/ceilometer/api-paste.ini options.
+#
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
 class ceilometer::config (
-  $ceilometer_config         = {},
+  $ceilometer_config        = {},
+  $ceilometer_api_paste_ini = {},
 ) {
+
   validate_hash($ceilometer_config)
+  validate_hash($ceilometer_api_paste_ini)
 
   create_resources('ceilometer_config', $ceilometer_config)
+  create_resources('ceilometer_api_paste_ini', $ceilometer_api_paste_ini)
 }
diff --git a/spec/unit/provider/ceilometer_api_paste_ini/ini_setting_spec.rb b/spec/unit/provider/ceilometer_api_paste_ini/ini_setting_spec.rb
new file mode 100644 (file)
index 0000000..b52a2c3
--- /dev/null
@@ -0,0 +1,28 @@
+# these tests are a little concerning b/c they are hacking around the
+# modulepath, so these tests will not catch issues that may eventually arise
+# related to loading these plugins.
+# I could not, for the life of me, figure out how to programatcally set the modulepath
+$LOAD_PATH.push(
+  File.join(
+    File.dirname(__FILE__),
+    '..',
+    '..',
+    '..',
+    'fixtures',
+    'modules',
+    'inifile',
+    'lib')
+)
+require 'spec_helper'
+provider_class = Puppet::Type.type(:ceilometer_api_paste_ini).provider(:ini_setting)
+describe provider_class do
+
+  it 'should allow setting to be set explicitly' do
+    resource = Puppet::Type::Ceilometer_api_paste_ini.new(
+      {:name => 'dude/foo', :value => 'bar'}
+    )
+    provider = provider_class.new(resource)
+    expect(provider.section).to eq('dude')
+    expect(provider.setting).to eq('foo')
+  end
+end
diff --git a/spec/unit/type/ceilometer_api_paste_ini_spec.rb b/spec/unit/type/ceilometer_api_paste_ini_spec.rb
new file mode 100644 (file)
index 0000000..ca57139
--- /dev/null
@@ -0,0 +1,34 @@
+require 'spec_helper'
+# this hack is required for now to ensure that the path is set up correctly
+# to retrive the parent provider
+$LOAD_PATH.push(
+  File.join(
+    File.dirname(__FILE__),
+    '..',
+    '..',
+    'fixtures',
+    'modules',
+    'inifile',
+    'lib')
+)
+require 'puppet/type/ceilometer_api_paste_ini'
+describe 'Puppet::Type.type(:ceilometer_api_paste_ini)' do
+  before :each do
+    @ceilometer_api_paste_ini = Puppet::Type.type(:ceilometer_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
+  end
+  it 'should accept a valid value' do
+    @ceilometer_api_paste_ini[:value] = 'bar'
+    expect(@ceilometer_api_paste_ini[:value]).to eq('bar')
+  end
+
+  it 'should autorequire the package that install the file' do
+    catalog = Puppet::Resource::Catalog.new
+    package = Puppet::Type.type(:package).new(:name => 'ceilometer')
+    catalog.add_resource package, @ceilometer_api_paste_ini
+    dependency = @ceilometer_api_paste_ini.autorequire
+    expect(dependency.size).to eq(1)
+    expect(dependency[0].target).to eq(@ceilometer_api_paste_ini)
+    expect(dependency[0].source).to eq(package)
+  end
+
+end