Skip to content

Commit

Permalink
Simplified logic on disable and enable operation (#5)
Browse files Browse the repository at this point in the history
* using modprobe module instead of shell

Signed-off-by: Lukas Bednar <[email protected]>
  • Loading branch information
lukas-bednar authored Jul 18, 2018
1 parent 9057108 commit 19f2a9e
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 32 deletions.
10 changes: 0 additions & 10 deletions tasks/disable.yml

This file was deleted.

10 changes: 0 additions & 10 deletions tasks/enable.yml

This file was deleted.

26 changes: 15 additions & 11 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
cat {{ nested_virtualization_test_path }}
register: actual_status

- include_tasks: enable.yml
when:
- nested_virtualization_state == "enabled"
- "'N' in actual_status.stdout or '0' in actual_status.stdout"

- name: "Persist configuration in {{ nested_virtualization_kvm_config }}"
lineinfile:
path: "{{ nested_virtualization_kvm_config }}"
Expand All @@ -50,16 +45,25 @@
when:
- nested_virtualization_state == "enabled"

- include_tasks: disable.yml
when:
- nested_virtualization_state == "disabled"
- "'Y' in actual_status.stdout or '1' in actual_status.stdout"

- name: "Persist configuration in {{ nested_virtualization_kvm_config }}"
lineinfile:
path: "{{ nested_virtualization_kvm_config }}"
regexp: "^options {{ nested_virtualization_module_name }}.*$"
line: "options {{ nested_virtualization_module_name }}"
state: absent
create: yes
when:
- nested_virtualization_state == "disabled"

# Desired state is enabled but real state is off
- name: "Reload {{ nested_virtualization_module_name }} module"
include_tasks: reload-module.yml
when:
- nested_virtualization_state == "enabled"
- "'N' in actual_status.stdout or '0' in actual_status.stdout"

# Desired state is disabled but real state is on
- name: "Reload {{ nested_virtualization_module_name }} module"
include_tasks: reload-module.yml
when:
- nested_virtualization_state == "disabled"
- "'Y' in actual_status.stdout or '1' in actual_status.stdout"
10 changes: 10 additions & 0 deletions tasks/reload-module.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
- name: "Remove {{ nested_virtualization_module_name }} module"
modprobe:
name: "{{ nested_virtualization_module_name }}"
state: absent

- name: "Load {{ nested_virtualization_module_name }} module"
modprobe:
name: "{{ nested_virtualization_module_name }}"
state: present
2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
hosts: docker_containers
roles:
- role: "nested-virtualization"
nested_virtualization_state: disable
nested_virtualization_state: "disabled"

0 comments on commit 19f2a9e

Please sign in to comment.