Merge "Add support for MultiStrOpt"

lib/puppet/provider/ec2api_config/ini_setting.rb

@@ -1,15 +0,0 @@
-Puppet::Type.type(:ec2api_config).provide(
-    :ini_setting,
-    :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
-) do
-
-  def self.file_path
-    '/etc/ec2api/ec2api.conf'
-  end
-
-  # added for backwards compatibility with older versions of inifile
-  def file_path
-    self.class.file_path
-  end
-
-end

lib/puppet/provider/ec2api_config/openstackconfig.rb

@@ -0,0 +1,10 @@
+Puppet::Type.type(:ec2api_config).provide(
+  :openstackconfig,
+  :parent => Puppet::Type.type(:openstack_config).provider(:ruby)
+) do
+
+  def self.file_path
+    '/etc/ec2api/ec2api.conf'
+  end
+
+end

lib/puppet/type/ec2api_config.rb

@@ -7,14 +7,22 @@ Puppet::Type.newtype(:ec2api_config) do
     newvalues(/\S+\/\S+/)
   end
 
-  newproperty(:value) do
+  newproperty(:value, :array_matching => :all) do
     desc 'The value of the setting to be defined.'
+    def insync?(is)
+      return true if @should.empty?
+      return false unless is.is_a? Array
+      return false unless is.length == @should.length
+      return (
+        is & @should == is or
+        is & @should.map(&:to_s) == is
+      )
+    end
     munge do |value|
       value = value.to_s.strip
       value.capitalize! if value =~ /^(true|false)$/i
       value
     end
-    newvalues(/^[\S ]*$/)
 
     def is_to_s( currentvalue )
       if resource.secret?

spec/unit/provider/ec2api_config/openstackconfig_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-provider_class = Puppet::Type.type(:ec2api_config).provider(:ini_setting)
+provider_class = Puppet::Type.type(:ec2api_config).provider(:openstackconfig)
 describe provider_class do
 
   it 'should default to the default setting when no other one is specified' do

spec/unit/type/ec2api_config_spec.rb

@@ -30,12 +30,12 @@ describe Puppet::Type.type(:ec2api_config) do
 
   it 'should accept a valid value' do
     @ec2api_config[:value] = 'bar'
-    expect(@ec2api_config[:value]).to eq('bar')
+    expect(@ec2api_config[:value]).to eq(['bar'])
   end
 
   it 'should not accept a value with whitespace' do
     @ec2api_config[:value] = 'b ar'
-    expect(@ec2api_config[:value]).to eq('b ar')
+    expect(@ec2api_config[:value]).to eq(['b ar'])
   end
 
   it 'should accept valid ensure values' do