--- a/dev/provisioning/modules/sysconfig/manifests/elasticsearch.pp	Thu Nov 10 02:01:46 2016 +0100
+++ b/dev/provisioning/modules/sysconfig/manifests/elasticsearch.pp	Thu Nov 10 14:07:02 2016 +0100
@@ -8,7 +8,12 @@
 
 
     exec { "systemd_restart_${es_instance}":
-        command     => '/bin/systemctl restart elasticsearch-${es_instance}',
+        command     => "/bin/systemctl start elasticsearch-${es_instance}",
+        refreshonly => true,
+    }
+
+    exec { "systemd_enable_${es_instance}":
+        command     => "/bin/systemctl enable elasticsearch-${es_instance}",
         refreshonly => true,
     }
 
@@ -16,6 +21,7 @@
       manage_repo  => true,
       autoupgrade => true,
       repo_version => '5.x',
+      status => 'unmanaged',
     }->
     elasticsearch::instance { $es_instance: }->
     file { '$es_instance jvm.options':
@@ -50,6 +56,6 @@
         owner => 'root',
         group => 'root',
         mode => '0750',
-        notify => [Exec['systemctl-daemon-reload'], Exec["systemd_restart_${es_instance}"]]
+        notify => [Exec['systemctl-daemon-reload'], Exec["systemd_enable_${es_instance}"], Exec["systemd_restart_${es_instance}"]]
     }
 }