Merge pull request #142 from apenney/aix-ipv6-fixes

Fix for AIX machines with IPv6 disabled.
puppetlabs · Mar 21, 2014 · f29b589 · f29b589
2 parents c6d341f + 726377a
commit f29b589
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 7 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,12 +9,6 @@
   $keys_trusted      = []
   $package_ensure    = 'present'
   $preferred_servers = []
-  $restrict          = [
-    'default kod nomodify notrap nopeer noquery',
-    '-6 default kod nomodify notrap nopeer noquery',
-    '127.0.0.1',
-    '-6 ::1',
-  ]
   $service_enable    = true
   $service_ensure    = 'running'
   $service_manage    = true
@@ -32,6 +26,10 @@
       $keysfile = '/etc/ntp.keys'
       $driftfile = '/etc/ntp.drift'
       $package_name = [ 'bos.net.tcp.client' ]
+      $restrict          = [
+        'default nomodify notrap nopeer noquery',
+        '127.0.0.1',
+      ]
       $service_name = 'xntpd'
       $servers = [
         '0.debian.pool.ntp.org iburst',
@@ -45,6 +43,12 @@
       $keys_file       = '/etc/ntp/keys'
       $driftfile       = '/var/lib/ntp/drift'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntp'
       $servers         = [
         '0.debian.pool.ntp.org iburst',
@@ -58,6 +62,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.centos.pool.ntp.org',
@@ -70,6 +80,12 @@
       $driftfile       = '/var/lib/ntp/drift/ntp.drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntp'
       $servers         = [
         '0.opensuse.pool.ntp.org',
@@ -83,6 +99,12 @@
       $driftfile       = '/var/db/ntpd.drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = ['net/ntp']
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.freebsd.pool.ntp.org iburst maxpoll 9',
@@ -96,6 +118,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.pool.ntp.org',
@@ -109,6 +137,12 @@
       $driftfile       = '/var/lib/ntp/drift'
       $keys_file       = '/etc/ntp/keys'
       $package_name    = ['net-misc/ntp']
+      $restrict          = [
+        'default kod nomodify notrap nopeer noquery',
+        '-6 default kod nomodify notrap nopeer noquery',
+        '127.0.0.1',
+        '-6 ::1',
+      ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.gentoo.pool.ntp.org',
@@ -126,6 +160,12 @@
           $driftfile       = '/var/lib/ntp/drift'
           $keys_file       = '/etc/ntp/keys'
           $package_name    = ['net-misc/ntp']
+          $restrict          = [
+            'default kod nomodify notrap nopeer noquery',
+            '-6 default kod nomodify notrap nopeer noquery',
+            '127.0.0.1',
+            '-6 ::1',
+          ]
           $service_name    = 'ntpd'
           $servers         = [
             '0.gentoo.pool.ntp.org',

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -27,7 +27,7 @@
     # Install module and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'ntp')
     hosts.each do |host|
-      shell("/bin/touch #{default['distmoduledir']}/hiera.yaml")
+      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
       shell('puppet module install puppetlabs-stdlib', :acceptable_exit_codes => [0,1])
     end
   end