Unverified Commit 76c1c522 authored by Romain Tartière's avatar Romain Tartière
Browse files

Remove legacy facts

parent a0f39317

data/osfamily/Suse/11.yaml

+1 −1
Original line number Diff line number Diff line 
---

postfix::params::restart_cmd: '/etc/init.d/postfix reload'

postfix::params::master_os_template: "postfix/master.cf.SLES%{::operatingsystemrelease}.erb"

postfix::params::master_os_template: "postfix/master.cf.SLES%{facts.os.release.full}.erb"

...

hiera.yaml

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ hierarchy: 


  - name: "Per-OS family"

    paths:

      - "osfamily/%{facts.os.family}/%{facts.lsbdistcodename}.yaml"

      - "osfamily/%{facts.os.family}/%{facts.operatingsystemmajrelease}.yaml"

      - "osfamily/%{facts.os.family}/%{facts.os.distro.codename}.yaml"

      - "osfamily/%{facts.os.family}/%{facts.os.release.major}.yaml"

      - "osfamily/%{facts.os.family}.yaml"



  - name: "Common data"

spec/acceptance/postfix_spec.rb

+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ describe 'postfix class' do 
    it 'works idempotently with no errors' do

      pp = <<-EOS

        # Make sure the default mailer is stopped in docker containers

        if $::operatingsystem == 'Debian' {

        if fact('os.name') == 'Debian' {

          service { 'exim4':

            ensure    => stopped,

            hasstatus => false,

            before    => Class['postfix'],

          }

        }

        if $::osfamily == 'RedHat' {

        if fact('os.family') == 'RedHat' {

          service { 'sendmail':

            ensure    => stopped,

            hasstatus => false,
@@ -50,7 +50,7 @@ describe 'postfix class' do 
    it 'works idempotently with no errors and with your own configuration of /etc/aliases' do

      pp = <<-EOS

        # Make sure the default mailer is stopped in docker containers

        if $::operatingsystem == 'Debian' {

        if fact('os.name') == 'Debian' {

          service { 'exim4':

            ensure    => stopped,

            hasstatus => false,

spec/classes/postfix_spec.rb

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ describe 'postfix' do 
          end

        end



        context 'when on Fedora', if: facts[:operatingsystem] == 'Fedora' do # rubocop:disable RSpec/MultipleMemoizedHelpers

        context 'when on Fedora', if: facts[:os]['name'] == 'Fedora' do # rubocop:disable RSpec/MultipleMemoizedHelpers

          it { is_expected.to contain_file('/etc/aliases').with_seltype('etc_aliases_t').with_content("# file managed by puppet\n") }



          it {