diff --git a/defaults/main.yml b/defaults/main.yml index f433645..838c4f8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -119,3 +119,24 @@ systemd_networks: [] # Cache: yes systemd_resolved: {} + +# Enable or Disable the availability of systemd-resolved. This option is a +# Boolean variable. + +systemd_resolved_available: "{{ _systemd_resolved_available | default(true) }}" + +# Specify the command used to update the initramfs. By default this will run +# "/bin/true" which is done because the command required to run should never +# be assumed. Distro specific config is available in vars otherwise deployers +# can set this as needed. + +systemd_networkd_update_initramfs: "{{ _systemd_networkd_update_initramfs | default('true') }}" + +# Provide a list of packages that are to be installed before this role is +# executed. + +# _systemd_networkd_distro_packages: +# - systemd-networkd +# - systemd-resolved + +systemd_networkd_distro_packages: "{{ _systemd_networkd_distro_packages | default([]) }}" diff --git a/vars/main.yml b/vars/main.yml index b8f0239..f78a119 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,6 +15,3 @@ ## APT Cache options cache_timeout: 600 - -# Supporting package required to make systemd-networkd function -systemd_networkd_distro_packages: [] diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 8aa24c6..99fa449 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -systemd_networkd_distro_packages: +_systemd_networkd_distro_packages: - systemd-networkd - systemd-resolved -systemd_resolved_available: true +_systemd_resolved_available: true -systemd_networkd_update_initramfs: "dracut -f" +_systemd_networkd_update_initramfs: "dracut -f" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index c449654..279be76 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -systemd_resolved_available: false +_systemd_resolved_available: false -systemd_networkd_update_initramfs: "dracut -f" +_systemd_networkd_update_initramfs: "dracut -f" diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 653cb4e..3df92b0 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -systemd_resolved_available: true +_systemd_resolved_available: true -systemd_networkd_update_initramfs: "/usr/sbin/update-initramfs -u" +_systemd_networkd_update_initramfs: "/usr/sbin/update-initramfs -u"