make flannel work on el6 also

cristifalcas · Jul 27, 2016 · 566ff08 · 566ff08
1 parent 60ed6ee
commit 566ff08
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 31 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -24,39 +24,41 @@
       mode    => '0644',
     }
 
-    if $flannel::manage_docker {
-      $docker_dropin_ensure = 'file'
-      include ::docker
-      File['/usr/lib/systemd/system/docker.service.d/flannel.conf'] ~> Service['flanneld'] ~> Service['docker']
-    } else {
-      $docker_dropin_ensure = 'absent'
-    }
-
-    file { '/usr/lib/systemd/system/docker.service.d/flannel.conf':
-      ensure  => $docker_dropin_ensure,
-      content => template("${module_name}/service_flannel.conf"),
-      mode    => '0644',
-    } ~>
-    exec { 'reload systemctl daemon for flannel':
-      command     => '/bin/systemctl daemon-reload',
-      refreshonly => true,
-    }
-
-    if $flannel::journald_forward_enable and $::operatingsystemmajrelease == 7 {
-      file { '/etc/systemd/system/flanneld.service.d':
-        ensure => 'directory',
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0755',
+    if $::operatingsystemmajrelease == 7 {
+      if $flannel::manage_docker {
+        $docker_dropin_ensure = 'file'
+        include ::docker
+        File['/usr/lib/systemd/system/docker.service.d/flannel.conf'] ~> Service['flanneld'] ~> Service['docker']
+      } else {
+        $docker_dropin_ensure = 'absent'
       }
-      file { '/etc/systemd/system/flanneld.service.d/journald.conf':
-        ensure  => file,
-        owner   => 'root',
-        group   => 'root',
+
+      file { '/usr/lib/systemd/system/docker.service.d/flannel.conf':
+        ensure  => $docker_dropin_ensure,
+        content => template("${module_name}/service_flannel.conf"),
         mode    => '0644',
-        content => template("${module_name}/journald.conf.erb"),
       } ~>
-      Exec['reload systemctl daemon for flannel']
+      exec { 'reload systemctl daemon for flannel':
+        command     => '/bin/systemctl daemon-reload',
+        refreshonly => true,
+      }
+
+      if $flannel::journald_forward_enable {
+        file { '/etc/systemd/system/flanneld.service.d':
+          ensure => 'directory',
+          owner  => 'root',
+          group  => 'root',
+          mode   => '0755',
+        }
+        file { '/etc/systemd/system/flanneld.service.d/journald.conf':
+          ensure  => file,
+          owner   => 'root',
+          group   => 'root',
+          mode    => '0644',
+          content => template("${module_name}/journald.conf.erb"),
+        } ~>
+        Exec['reload systemctl daemon for flannel']
+      }
     }
   } else {
     fail("Unsupported OS: ${::osfamily}")

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
 	"name": "cristifalcas-flannel",
-	"version": "1.4.1",
+	"version": "1.5.0",
 	"author": "Cristian Falcas",
 	"license": "Apache-2.0",
 	"project_page": "https://github.com/cristifalcas/puppet-flannel",