Merge pull request #471 from treydock/restart-etcd

Ensure that changes to etcd systemd reload and restart etcd

Author: daianamezdrea

manifests/service.pp

@@ -6,6 +6,7 @@
   Boolean $controller                                   = $kubernetes::controller,
   Boolean $manage_docker                                = $kubernetes::manage_docker,
   Boolean $manage_etcd                                  = $kubernetes::manage_etcd,
+  String $etcd_install_method                           = $kubernetes::etcd_install_method,
   String $kubernetes_version                            = $kubernetes::kubernetes_version,
   Optional[String] $cloud_provider                      = $kubernetes::cloud_provider,
   Optional[String] $cloud_config                        = $kubernetes::cloud_config,
@@ -72,7 +73,21 @@
       ensure => running,
       enable => true,
     }
-    File <| path == '/etc/systemd/system/kubelet.service.d' or path == '/etc/default/etcd' |> ~> Service['etcd']
+    File <|
+      path == '/etc/systemd/system/kubelet.service.d' or
+      path == '/etc/default/etcd' or
+      path == '/etc/systemd/system/etcd.service'
+    |> ~> Service['etcd']
+
+    if $etcd_install_method == 'wget' {
+      exec { 'systemctl-daemon-reload-etcd':
+        path        => '/usr/bin:/bin:/usr/sbin:/sbin',
+        command     => 'systemctl daemon-reload',
+        refreshonly => true,
+        subscribe   => File['/etc/systemd/system/etcd.service'],
+        notify      => Service['etcd'],
+      }
+    }
   }
 
   # RedHat needs to have CPU and Memory accounting enabled to avoid systemd proc errors

spec/classes/service_spec.rb

@@ -71,11 +71,13 @@
             'cloud_config' => '',
             'manage_docker' => false,
             'manage_etcd' => true,
+            'etcd_install_method' => 'wget',
         }
     end
     it { should_not contain_service('docker')}
     it { should contain_service('etcd')}
     it { should contain_service('kubelet')}
+    it { should contain_exec('systemctl-daemon-reload-etcd') }
   end
 
   context 'with os.family => RedHat' do