Merge pull request #101 from play-iot/release/vpnc-deployer/0.10.1

Release/vpnc deployer/0.10.1
play-iot · Jun 16, 2021 · 03e986f · 03e986f
2 parents b6b5476 + f58d280
commit 03e986f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/cli/CHANGELOG-VPNC-DEPLOYER.md b/cli/CHANGELOG-VPNC-DEPLOYER.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.10.1](https://github.com/play-iot/iot-vpn/tree/vpnc-deployer/v0.10.1) (2021-06-16)
+
+### Improvement
+
+- Move `fix-connman-dhcp` into `roles/vpnc-state`
+
 ## [v0.10.0](https://github.com/play-iot/iot-vpn/tree/vpnc-deployer/v0.10.0) (2021-06-16)
 
 ### Improvement

diff --git a/cli/ansible/roles/vpnc-state/defaults/main.yml b/cli/ansible/roles/vpnc-state/defaults/main.yml
@@ -1,5 +1,6 @@
 args_vpn_state_show: False
 args_vpn_state_assert_install: False
 args_vpn_state_assert_work: False
+args_vpn_state_fix_connman: False
 args_vpn_state_test_domains:
   - google.com
diff --git a/cli/ansible/roles/vpnc-state/tasks/main.yml b/cli/ansible/roles/vpnc-state/tasks/main.yml
@@ -8,6 +8,10 @@
   - name: Check VPNC CLI install
     include_tasks: 01_check_vpnc_cli.yml
 
+  - name: Fix Connman DHClient if needed
+    when: args_vpn_state_fix_connman and resp_vpnc_state['is_exec']
+    include_tasks: tasks/connman_dhclient.yml
+
   - name: Check VPNC service status
     include_tasks: 02_check_vpnc_service.yml
 

diff --git a/cli/ansible/wf-vpnc-extend.yml b/cli/ansible/wf-vpnc-extend.yml
@@ -27,12 +27,10 @@
       vars:
         runtime_vpn_conn: "{{ resp_prepare_credential }}"
 
-    - name: Fix Connman DHClient if needed
-      include_tasks: tasks/connman_dhclient.yml
-
     - name: Validate VPNC state
       include_role:
         name: vpnc-state
       vars:
         args_vpn_state_show: True
+        args_vpn_state_fix_connman: True
         args_vpn_state_assert_work: True
diff --git a/cli/ansible/wf-vpnc-rollout.yml b/cli/ansible/wf-vpnc-rollout.yml
@@ -34,14 +34,12 @@
       include_role:
         name: vpnc-upgrade
 
-    - name: Fix Connman DHClient if needed
-      include_tasks: tasks/connman_dhclient.yml
-
     - name: Validate VPNC state
       when: wf_precondition_is_installed or wf_precondition_is_upgraded
       include_role:
         name: vpnc-state
       vars:
         args_vpn_state_show: True
         args_vpn_state_assert_install: True
+        args_vpn_state_fix_connman: True
         args_vpn_state_assert_work: "{{ wf_precondition_is_work == 0 }}"
diff --git a/cli/ansible/wf-vpnc-state.yml b/cli/ansible/wf-vpnc-state.yml
@@ -12,3 +12,4 @@
         name: vpnc-state
       vars:
         args_vpn_state_show: True
+        args_vpn_state_fix_connman: True