Merge pull request #13 from gizmoguy/upstream

Stop sorting config keys for newer ruby versions.

manifests/config.pp

@@ -3,6 +3,7 @@
   $ensure                  = $sssd::ensure,
   $config                  = $sssd::config,
   $config_file             = $sssd::config_file,
+  $config_template         = $sssd::config_template,
   $mkhomedir               = $sssd::mkhomedir,
   $enable_mkhomedir_flags  = $sssd::enable_mkhomedir_flags,
   $disable_mkhomedir_flags = $sssd::disable_mkhomedir_flags,
@@ -14,7 +15,7 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0600',
-    content => template("${module_name}/sssd.conf.erb"),
+    content => template($config_template),
   }
 
   case $::osfamily {

manifests/init.pp

@@ -72,6 +72,7 @@
   $extra_packages          = $sssd::params::extra_packages,
   $extra_packages_ensure   = $sssd::params::extra_packages_ensure,
   $config_file             = $sssd::params::config_file,
+  $config_template         = $sssd::params::config_template,
   $mkhomedir               = $sssd::params::mkhomedir,
   $manage_oddjobd          = $sssd::params::manage_oddjobd,
   $service_ensure          = $sssd::params::service_ensure,
@@ -85,7 +86,8 @@
 
   validate_string(
     $sssd_package,
-    $sssd_service
+    $sssd_service,
+    $config_template
   )
 
   validate_array(

manifests/params.pp

@@ -17,6 +17,14 @@
   $enable_mkhomedir_flags  = ['--enablesssd', '--enablesssdauth', '--enablemkhomedir']
   $disable_mkhomedir_flags = ['--enablesssd', '--enablesssdauth', '--disablemkhomedir']
 
+  # Earlier versions of ruby didn't provide ordered hashs, so we need to sort
+  # the configuration ourselves to ensure a consistent config file.
+  if versioncmp($::rubyversion, '1.9.3') >= 0 {
+    $config_template = "${module_name}/sssd.conf.erb"
+  } else {
+    $config_template = "${module_name}/sssd.conf.sorted.erb"
+  }
+
   case $::osfamily {
 
     'RedHat': {

spec/classes/init_spec.rb

@@ -1,13 +1,26 @@
 require 'spec_helper'
 describe 'sssd' do
   describe 'on RedHat 5.11' do
-    let(:facts) { { :osfamily => 'RedHat', :operatingsystemrelease => '5.7' } }
+    let(:facts) do
+      {
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '5.7',
+        :rubyversion => '1.9.3'
+      }
+    end
 
     context 'with defaults for all parameters' do
       it { is_expected.to contain_class('sssd::install') }
       it { is_expected.to contain_class('sssd::config') }
       it { is_expected.to contain_class('sssd::service') }
 
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(/^# Managed by Puppet.\n\n\[sssd\]/)
+      end
+
       it { is_expected.to contain_package('authconfig').with_ensure('latest') }
       it { is_expected.not_to contain_package('oddjob-mkhomedir') }
       it { is_expected.not_to contain_service('oddjobd') }
@@ -20,15 +33,44 @@
       let(:params) { { :service_ensure => 'stopped' } }
       it { is_expected.to contain_service('sssd').with_ensure('stopped') }
     end
+
+    context 'with ruby without ordered hashes' do
+      let(:facts) do
+        {
+          :osfamily => 'RedHat',
+          :operatingsystemrelease => '5.7',
+          :rubyversion => '1.8.7'
+        }
+      end
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(%r{^# Managed by Puppet.\n\n\[domain/ad.example.com\]})
+      end
+    end
   end
   describe 'on RedHat 6.6' do
-    let(:facts) { { :osfamily => 'RedHat', :operatingsystemrelease => '6.6' } }
+    let(:facts) do
+      {
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '6.6',
+        :rubyversion => '1.9.3'
+      }
+    end
 
     context 'with defaults for all parameters' do
       it { is_expected.to contain_class('sssd::install') }
       it { is_expected.to contain_class('sssd::config') }
       it { is_expected.to contain_class('sssd::service') }
 
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(/^# Managed by Puppet.\n\n\[sssd\]/)
+      end
+
       it { is_expected.to contain_package('authconfig').with_ensure('present') }
       it { is_expected.to contain_package('oddjob-mkhomedir') }
       it { is_expected.to contain_service('oddjobd') }
@@ -43,15 +85,44 @@
       it { is_expected.to contain_service('sssd').with_ensure('stopped') }
       it { is_expected.to contain_service('oddjobd').with_ensure('stopped') }
     end
+
+    context 'with ruby without ordered hashes' do
+      let(:facts) do
+        {
+          :osfamily => 'RedHat',
+          :operatingsystemrelease => '6.6',
+          :rubyversion => '1.8.7'
+        }
+      end
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(%r{^# Managed by Puppet.\n\n\[domain/ad.example.com\]})
+      end
+    end
   end
   describe 'on RedHat 7.1' do
-    let(:facts) { { :osfamily => 'RedHat', :operatingsystemrelease => '7.1' } }
+    let(:facts) do
+      {
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '7.1',
+        :rubyversion => '1.9.3'
+      }
+    end
 
     context 'with defaults for all parameters' do
       it { is_expected.to contain_class('sssd::install') }
       it { is_expected.to contain_class('sssd::config') }
       it { is_expected.to contain_class('sssd::service') }
 
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(/^# Managed by Puppet.\n\n\[sssd\]/)
+      end
+
       it { is_expected.to contain_package('authconfig').with_ensure('present') }
       it { is_expected.to contain_package('oddjob-mkhomedir') }
       it { is_expected.to contain_service('oddjobd') }
@@ -66,15 +137,44 @@
       it { is_expected.to contain_service('sssd').with_ensure('stopped') }
       it { is_expected.to contain_service('oddjobd').with_ensure('stopped') }
     end
+
+    context 'with ruby without ordered hashes' do
+      let(:facts) do
+        {
+          :osfamily => 'RedHat',
+          :operatingsystemrelease => '7.1',
+          :rubyversion => '1.8.7'
+        }
+      end
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(%r{^# Managed by Puppet.\n\n\[domain/ad.example.com\]})
+      end
+    end
   end
   describe 'on Debian 8.1' do
-    let(:facts) { { :osfamily => 'Debian', :operatingsystemrelease => '8.1' } }
+    let(:facts) do
+      {
+        :osfamily => 'Debian',
+        :operatingsystemrelease => '8.1',
+        :rubyversion => '1.9.3'
+      }
+    end
 
     context 'with defaults for all parameters' do
       it { is_expected.to contain_class('sssd::install') }
       it { is_expected.to contain_class('sssd::config') }
       it { is_expected.to contain_class('sssd::service') }
 
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(/^# Managed by Puppet.\n\n\[sssd\]/)
+      end
+
       it { is_expected.not_to contain_package('authconfig') }
       it { is_expected.not_to contain_package('oddjob-mkhomedir') }
       it { is_expected.to contain_package('libpam-runtime').with_ensure('present') }
@@ -87,5 +187,21 @@
       let(:params) { { :service_ensure => 'stopped' } }
       it { is_expected.to contain_service('sssd').with_ensure('stopped') }
     end
+
+    context 'with ruby without ordered hashes' do
+      let(:facts) do
+        {
+          :osfamily => 'Debian',
+          :operatingsystemrelease => '8.1',
+          :rubyversion => '1.8.7'
+        }
+      end
+      it do
+        is_expected.to contain_file('sssd.conf') \
+          .with_ensure('present') \
+          .with_path('/etc/sssd/sssd.conf') \
+          .with_content(%r{^# Managed by Puppet.\n\n\[domain/ad.example.com\]})
+      end
+    end
   end
 end

templates/sssd.conf.erb

@@ -1,9 +1,9 @@
 # Managed by Puppet.
 
-<% @config.sort.map do |k,v| -%>
+<% @config.map do |k,v| -%>
 <%   if v.is_a?(Hash) -%>
 [<%=  k %>]
-<%     v.sort.map do |ki, vi| -%>
+<%     v.map do |ki, vi| -%>
 <%       if vi.is_a?(Array) -%>
 <%=        ki %> = <%= vi.join(', ') %>
 <%       elsif vi != :undef -%>
@@ -12,5 +12,5 @@
 <%     end -%>
 <%   else -%>
 [<%=  k %>]
-<%   end %>
+<%   end -%>
 <% end -%>

templates/sssd.conf.sorted.erb

@@ -0,0 +1,16 @@
+# Managed by Puppet.
+
+<% @config.sort.map do |k,v| -%>
+<%   if v.is_a?(Hash) -%>
+[<%=  k %>]
+<%     v.sort.map do |ki, vi| -%>
+<%       if vi.is_a?(Array) -%>
+<%=        ki %> = <%= vi.join(', ') %>
+<%       elsif vi != :undef -%>
+<%=        ki %> = <%= vi %>
+<%       end -%>
+<%     end -%>
+<%   else -%>
+[<%=  k %>]
+<%   end -%>
+<% end -%>