Add option to keep networking.service state

stuvusIT · Jan 14, 2020 · c2a0a6e · c2a0a6e
1 parent c39a272
commit c2a0a6e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -5,8 +5,12 @@ configuration.
 "systemd-networkd is a system service that manages networks".
 For DNS resolution, you can choose between systemd-resolved and resolvconf.
 
-The legacy `networking.service` can optionally be enabled, see
+This role can enable or disable the legacy `networking.service`, see
 [`systemd_network_enable_legacy_networking`](#role-variable-defaults).
+If you set `systemd_network_enable_legacy_networking: keep`, then this role will
+not touch the state of the `networking.service`.
+For configuring your whole network configuration using this role it is
+however recommended to set that variable to `False`.
 
 ## Requirements
 
@@ -279,10 +283,10 @@ systemd_network_networks:
 
 ## Role variable defaults
 
-| Name                                       | Default              | Description                                    |
-| :----------------------------------------- | :------------------- | :--------------------------------------------- |
-| `systemd_network_netdevs`                  | `{}`                 | [#detailed-description](#detailed-description) |
-| `systemd_network_networks`                 | `{}`                 | [#detailed-description](#detailed-description) |
-| `systemd_network_copy_files`               | `[]`                 | [#upload-extra-files](#upload-extra-files)     |
-| `systemd_network_dns_resolver`             | `"systemd-resolved"` | [#dns-resolver](#dns-resolver)                 |
-| `systemd_network_enable_legacy_networking` | `False`              | Whether to enable `networking.service`         |
+| Name                                       | Default              | Description                                                          |
+| :----------------------------------------- | :------------------- | :------------------------------------------------------------------- |
+| `systemd_network_netdevs`                  | `{}`                 | [#detailed-description](#detailed-description)                       |
+| `systemd_network_networks`                 | `{}`                 | [#detailed-description](#detailed-description)                       |
+| `systemd_network_copy_files`               | `[]`                 | [#upload-extra-files](#upload-extra-files)                           |
+| `systemd_network_dns_resolver`             | `"systemd-resolved"` | [#dns-resolver](#dns-resolver)                                       |
+| `systemd_network_enable_legacy_networking` | `"keep"`             | Whether to enable `networking.service` (`True`, `False` or `"keep"`) |
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,4 +3,4 @@ systemd_network_netdevs: {}
 systemd_network_networks: {}
 systemd_network_copy_files: []
 systemd_network_dns_resolver: systemd-resolved
-systemd_network_enable_legacy_networking: False
+systemd_network_enable_legacy_networking: keep
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -61,6 +61,7 @@
     name: networking
     enabled: "{{ systemd_network_enable_legacy_networking }}"
     state: "{% if systemd_network_enable_legacy_networking %}started{% else %}stopped{% endif %}"
+  when: systemd_network_enable_legacy_networking != "keep"
 
 - name: Enable systemd-networkd
   service: