Merge pull request #21 from fbourqui/master

Change default renderer to not specified which will default to systemd-networkd.
mrlesmithjr · Jul 14, 2020 · f4d1d30 · f4d1d30
2 parents 4f8b993 + 685a879
commit f4d1d30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,12 +1,12 @@
 ---
 # defaults file for ansible-netplan
-netplan_config_file: /etc/netplan/config.yaml
+netplan_config_file: /etc/netplan/ansible-config.yaml
 
 # switch to enable/disable the role completely
 netplan_enabled: true
 
-# Either networkd or NetworkManager
-netplan_renderer: networkd
+# Configured devices get handled by systemd-networkd by default, unless explicitly marked as managed by a specific renderer (NetworkManager)
+netplan_renderer:
 
 netplan_configuration:
   {}

diff --git a/meta/main.yml b/meta/main.yml
@@ -10,8 +10,8 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - artful
         - bionic
+        - focal
 
   galaxy_tags:
     - networking

diff --git a/templates/etc/netplan/config.yaml.j2 b/templates/etc/netplan/config.yaml.j2
@@ -1,7 +1,9 @@
 ---
 network:
   version: {{ netplan_configuration['network']['version']|default('2') }}
+{% if netplan_renderer is not none %}
   renderer: {{ netplan_renderer }}
+{% endif %}
 {% if netplan_configuration['network']['ethernets'] is defined %}
   ethernets:
 {{ netplan_configuration['network']['ethernets']|to_nice_yaml|indent(4, true) }}