From 43fbbe1f184622138c174ad33686f16381e4ff43 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 10 Jul 2022 14:29:24 +0900 Subject: [PATCH] Support `Ubuntu 22.04`. --- cookbooks/consul/attributes.rb | 2 +- cookbooks/consul/dnsmasq.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/consul/attributes.rb b/cookbooks/consul/attributes.rb index 4d8fdb8..1862167 100644 --- a/cookbooks/consul/attributes.rb +++ b/cookbooks/consul/attributes.rb @@ -2,7 +2,7 @@ # Specifying the default settings: # ------------------------------------------- case run_command('grep VERSION_ID /etc/os-release | awk -F\" \'{print $2}\'').stdout.chomp -when "20.04" +when "20.04", "22.04" cmd = 'LANG=C ip a | grep "inet " | grep -v -E "(127|172)" | cut -d" " -f6 | perl -pe "s/\/.+//g"' when "18.04" diff --git a/cookbooks/consul/dnsmasq.rb b/cookbooks/consul/dnsmasq.rb index 92286db..e0ae13a 100644 --- a/cookbooks/consul/dnsmasq.rb +++ b/cookbooks/consul/dnsmasq.rb @@ -7,7 +7,7 @@ package 'dnsmasq' end case run_command('grep VERSION_ID /etc/os-release | awk -F\" \'{print $2}\'').stdout.chomp -when "20.04" +when "20.04", "22.04" template '/etc/systemd/resolved.conf' do owner 'root' group 'root'