Merge pull request puppetlabs#151 from lucywyman/add-enable

(maint) Add enable and disable actions for *nix

Author: beechtom

spec/acceptance/linux_spec.rb

@@ -1,6 +1,8 @@
 # run a test task
 require 'spec_helper_acceptance'
 
+sysv = (os[:family] == 'redhat' && os[:release].to_i == 6) ||
+       (os[:family] == 'debian' && os[:release].to_i == 14)
 describe 'linux service task', unless: os[:family] == 'windows' do
   package_to_use = if os[:family] == 'redhat'
                      'httpd'
@@ -40,6 +42,22 @@
     end
   end
 
+  describe 'enable action', unless: sysv do
+    it "enable #{package_to_use}" do
+      result = run_bolt_task('service::linux', 'action' => 'enable', 'name' => package_to_use)
+      expect(result.exit_code).to eq(0)
+      expect(result['result']).to include('enabled' => 'enabled')
+    end
+  end
+
+  describe 'disable action', unless: sysv do
+    it "disable #{package_to_use}" do
+      result = run_bolt_task('service::linux', 'action' => 'disable', 'name' => package_to_use)
+      expect(result.exit_code).to eq(0)
+      expect(result['result']).to include('enabled' => 'disabled')
+    end
+  end
+
   context 'when a service does not exist' do
     let(:non_existent_service) { 'foo' }
 
@@ -64,22 +82,11 @@
       File.delete(temp_inventory_file) if File.exist?(temp_inventory_file)
     end
 
-    it 'enable action fails' do
-      params = { 'action' => 'enable', 'name' => package_to_use }
-      result = run_bolt_task('service', params, expect_failures: true, inventory_file: temp_inventory_file)
-      expect(result['result']).to include('status' => 'failure')
-      expect(result['result']['_error']).to include('msg' => %r{'enable' action not supported})
-      expect(result['result']['_error']).to include('kind' => 'bash-error')
-      expect(result['result']['_error']).to include('details')
-    end
-
-    it 'disable action fails' do
-      params = { 'action' => 'disable', 'name' => package_to_use }
-      result = run_bolt_task('service', params, expect_failures: true, inventory_file: temp_inventory_file)
-      expect(result['result']).to include('status' => 'failure')
-      expect(result['result']['_error']).to include('msg' => %r{'disable' action not supported})
-      expect(result['result']['_error']).to include('kind' => 'bash-error')
-      expect(result['result']['_error']).to include('details')
+    it 'does not use the ruby task' do
+      params = { 'action' => 'restart', 'name' => package_to_use }
+      result = run_bolt_task('service', params, inventory_file: temp_inventory_file)
+      expect(result.exit_code).to eq(0)
+      expect(result['result']).to include('status' => %r{ActiveState=active|running})
     end
   end
 end

tasks/linux.json

@@ -4,8 +4,8 @@
   "input_method": "environment",
   "parameters": {
     "action": {
-      "description": "The operation (start, stop, restart, status) to perform on the service.",
-      "type": "Enum[start, stop, restart, status]"
+      "description": "The operation (start, stop, restart, status, enable, disable) to perform on the service.",
+      "type": "Enum[start, stop, restart, status, enable, disable]"
     },
     "name": {
       "description": "The name of the service to operate on.",

tasks/linux.sh

@@ -21,7 +21,7 @@ done
 
 # Verify only allowable actions are specified
 case "$action" in
-  "start"|"stop"|"restart"|"status");;
+  "start"|"stop"|"restart"|"status"|"enable"|"disable");;
   *) validation_error "'${action}' action not supported for linux.sh"
 esac
 
@@ -37,15 +37,19 @@ case "$available_manager" in
     # sample output: "MainPID=23377,LoadState=loaded,ActiveState=active"
     cmd_out="$("$service" "show" "$name" -p LoadState -p MainPID -p ActiveState --no-pager | paste -sd ',' -)"
 
-    if [[ $action != "status" ]]; then
-      success "{ \"status\": \"${cmd_out}\" }"
-    else
+    if [[ $action == "status" || $action == "enable" || $action == "disable" ]]; then
       enabled_out="$("$service" "is-enabled" "$name" 2>&1)"
       success "{ \"status\": \"${cmd_out}\", \"enabled\": \"${enabled_out}\" }"
+    else
+      success "{ \"status\": \"${cmd_out}\" }"
     fi
     ;;
 
   "initctl")
+    if [[ $action == "enable" || $action == "disable" ]]; then
+      validation_error "'${action}' action not supported for initctl"
+    fi
+
     cmd=("$service" "$action" "$name")
     cmd_status=("$service" "status" "$name")
 
@@ -70,6 +74,10 @@ case "$available_manager" in
     ;;
 
   "service")
+    if [[ $action == "enable" || $action == "disable" ]]; then
+      validation_error "'${action}' action not supported for initctl"
+    fi
+
     cmd=("$service" "$name" "$action")
     cmd_status=("$service" "$name" "status")